From 8bfb368a61021975ffd1d4fcfae06aa5049075a0 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Thu, 12 Nov 2015 13:32:43 -0800 Subject: [PATCH] fix mac compiler error --- libraries/octree/src/OctreeElement.cpp | 10 +++++----- libraries/octree/src/OctreePacketData.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/octree/src/OctreeElement.cpp b/libraries/octree/src/OctreeElement.cpp index 74d23f14cc..2cff868035 100644 --- a/libraries/octree/src/OctreeElement.cpp +++ b/libraries/octree/src/OctreeElement.cpp @@ -28,11 +28,11 @@ #include "OctreeLogging.h" #include "SharedUtil.h" -AtomicUIntStat OctreeElement::_octreeMemoryUsage = 0; -AtomicUIntStat OctreeElement::_octcodeMemoryUsage = 0; -AtomicUIntStat OctreeElement::_externalChildrenMemoryUsage = 0; -AtomicUIntStat OctreeElement::_voxelNodeCount = 0; -AtomicUIntStat OctreeElement::_voxelNodeLeafCount = 0; +AtomicUIntStat OctreeElement::_octreeMemoryUsage { 0 }; +AtomicUIntStat OctreeElement::_octcodeMemoryUsage { 0 }; +AtomicUIntStat OctreeElement::_externalChildrenMemoryUsage { 0 }; +AtomicUIntStat OctreeElement::_voxelNodeCount { 0 }; +AtomicUIntStat OctreeElement::_voxelNodeLeafCount { 0 }; void OctreeElement::resetPopulationStatistics() { _voxelNodeCount = 0; diff --git a/libraries/octree/src/OctreePacketData.cpp b/libraries/octree/src/OctreePacketData.cpp index 7a255ad648..811e96fcf4 100644 --- a/libraries/octree/src/OctreePacketData.cpp +++ b/libraries/octree/src/OctreePacketData.cpp @@ -488,8 +488,8 @@ bool OctreePacketData::appendRawData(QByteArray data) { } -AtomicUIntStat OctreePacketData::_compressContentTime = 0; -AtomicUIntStat OctreePacketData::_compressContentCalls = 0; +AtomicUIntStat OctreePacketData::_compressContentTime { 0 }; +AtomicUIntStat OctreePacketData::_compressContentCalls { 0 }; bool OctreePacketData::compressContent() { PerformanceWarning warn(false, "OctreePacketData::compressContent()", false, &_compressContentTime, &_compressContentCalls);