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

Don't initialize an atomic; squelch gcc warning

Browse source
This commit is contained in:
Simon Walton 2018-07-27 10:05:34 -07:00
parent 0cec9a72d6
commit 4d559bbaee
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/octree/src/OctreeProcessor.h
View file

@ -79,7 +79,7 @@ protected:
int _packetsInLastWindow = 0; int _packetsInLastWindow = 0;
int _elementsInLastWindow = 0; int _elementsInLastWindow = 0;
int _entitiesInLastWindow = 0; int _entitiesInLastWindow = 0;
std::atomic<OCTREE_PACKET_SEQUENCE> _lastOctreeMessageSequence = 0; std::atomic<OCTREE_PACKET_SEQUENCE> _lastOctreeMessageSequence;
}; };

2
libraries/octree/src/OctreeQuery.cpp
View file

@ -27,7 +27,7 @@ OctreeQuery::OctreeQuery(bool randomizeConnectionID) {
} }
} }
const OctreeQuery::OctreeQueryFlags operator|=(OctreeQuery::OctreeQueryFlags& lhs, int rhs) { OctreeQuery::OctreeQueryFlags operator|=(OctreeQuery::OctreeQueryFlags& lhs, int rhs) {
return lhs = OctreeQuery::OctreeQueryFlags(lhs | rhs); return lhs = OctreeQuery::OctreeQueryFlags(lhs | rhs);
} }

2
libraries/octree/src/OctreeQuery.h
View file

@ -79,7 +79,7 @@ protected:
QReadWriteLock _jsonParametersLock; QReadWriteLock _jsonParametersLock;
enum OctreeQueryFlags : uint16_t { NoFlags = 0x0, WantInitialCompletion = 0x1 }; enum OctreeQueryFlags : uint16_t { NoFlags = 0x0, WantInitialCompletion = 0x1 };
friend const OctreeQuery::OctreeQueryFlags operator|=(OctreeQuery::OctreeQueryFlags& lhs, const int rhs); friend OctreeQuery::OctreeQueryFlags operator|=(OctreeQuery::OctreeQueryFlags& lhs, const int rhs);
bool _hasReceivedFirstQuery { false }; bool _hasReceivedFirstQuery { false };
bool _reportInitialCompletion { false }; bool _reportInitialCompletion { false };