Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 00:36:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix mac compiler error

Browse source
This commit is contained in:
Brad Hefta-Gaub 2015-11-12 13:24:25 -08:00
parent 66a2b38f50
commit 14a6e1fb6b
3 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
assignment-client/src/octree/OctreeSendThread.cpp
View file

@ -112,12 +112,11 @@ bool OctreeSendThread::process() {
return isStillRunning(); // keep running till they terminate us return isStillRunning(); // keep running till they terminate us
} }
AtomicUIntStat OctreeSendThread::_usleepTime = 0; AtomicUIntStat OctreeSendThread::_usleepTime { 0 };
AtomicUIntStat OctreeSendThread::_usleepCalls = 0; AtomicUIntStat OctreeSendThread::_usleepCalls { 0 };
AtomicUIntStat OctreeSendThread::_totalBytes { 0 };
AtomicUIntStat OctreeSendThread::_totalBytes = 0; AtomicUIntStat OctreeSendThread::_totalWastedBytes { 0 };
AtomicUIntStat OctreeSendThread::_totalWastedBytes = 0; AtomicUIntStat OctreeSendThread::_totalPackets { 0 };
AtomicUIntStat OctreeSendThread::_totalPackets = 0;
int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytesSent, int& truePacketsSent) { int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytesSent, int& truePacketsSent) {
OctreeServer::didHandlePacketSend(this); OctreeServer::didHandlePacketSend(this);

11
libraries/octree/src/OctreeElement.cpp
View file

@ -245,12 +245,11 @@ bool OctreeElement::isParentOf(OctreeElementPointer possibleChild) const {
return false; return false;
} }
AtomicUIntStat OctreeElement::_getChildAtIndexTime = 0; AtomicUIntStat OctreeElement::_getChildAtIndexTime { 0 };
AtomicUIntStat OctreeElement::_getChildAtIndexCalls = 0; AtomicUIntStat OctreeElement::_getChildAtIndexCalls { 0 };
AtomicUIntStat OctreeElement::_setChildAtIndexTime = 0; AtomicUIntStat OctreeElement::_setChildAtIndexTime { 0 };
AtomicUIntStat OctreeElement::_setChildAtIndexCalls = 0; AtomicUIntStat OctreeElement::_setChildAtIndexCalls { 0 };
AtomicUIntStat OctreeElement::_externalChildrenCount { 0 };
AtomicUIntStat OctreeElement::_externalChildrenCount = 0;
AtomicUIntStat OctreeElement::_childrenCount[NUMBER_OF_CHILDREN + 1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; AtomicUIntStat OctreeElement::_childrenCount[NUMBER_OF_CHILDREN + 1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
OctreeElementPointer OctreeElement::getChildAtIndex(int childIndex) const { OctreeElementPointer OctreeElement::getChildAtIndex(int childIndex) const {

12
libraries/octree/src/OctreePacketData.cpp
View file

@ -16,12 +16,12 @@
#include "OctreePacketData.h" #include "OctreePacketData.h"
bool OctreePacketData::_debug = false; bool OctreePacketData::_debug = false;
AtomicUIntStat OctreePacketData::_totalBytesOfOctalCodes = 0; AtomicUIntStat OctreePacketData::_totalBytesOfOctalCodes { 0 };
AtomicUIntStat OctreePacketData::_totalBytesOfBitMasks = 0; AtomicUIntStat OctreePacketData::_totalBytesOfBitMasks { 0 };
AtomicUIntStat OctreePacketData::_totalBytesOfColor = 0; AtomicUIntStat OctreePacketData::_totalBytesOfColor { 0 };
AtomicUIntStat OctreePacketData::_totalBytesOfValues = 0; AtomicUIntStat OctreePacketData::_totalBytesOfValues { 0 };
AtomicUIntStat OctreePacketData::_totalBytesOfPositions = 0; AtomicUIntStat OctreePacketData::_totalBytesOfPositions { 0 };
AtomicUIntStat OctreePacketData::_totalBytesOfRawData = 0; AtomicUIntStat OctreePacketData::_totalBytesOfRawData { 0 };
OctreePacketData::OctreePacketData(bool enableCompression, int targetSize) { OctreePacketData::OctreePacketData(bool enableCompression, int targetSize) {
changeSettings(enableCompression, targetSize); // does reset... changeSettings(enableCompression, targetSize); // does reset...