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

Fix windows compile error.

Browse source
This commit is contained in:
Atlante45 2015-12-16 11:07:19 -08:00
parent a541fdd2df
commit b4dc3b1b47
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/octree/OctreeServer.cpp
View file

@ -1205,7 +1205,7 @@ void OctreeServer::aboutToFinish() {
// we're going down - set the NodeList linkedDataCallback to NULL so we do not create any more OctreeQueryNode objects. // we're going down - set the NodeList linkedDataCallback to NULL so we do not create any more OctreeQueryNode objects.
// This ensures that we don't get any more newly connecting nodes // This ensures that we don't get any more newly connecting nodes
DependencyManager::get<NodeList>()->linkedDataCreateCallback = NULL; DependencyManager::get<NodeList>()->linkedDataCreateCallback = nullptr;
if (_octreeInboundPacketProcessor) { if (_octreeInboundPacketProcessor) {
_octreeInboundPacketProcessor->terminating(); _octreeInboundPacketProcessor->terminating();

1
libraries/networking/src/LimitedNodeList.cpp
View file

@ -40,7 +40,6 @@ const char SOLO_NODE_TYPES[2] = {
}; };
LimitedNodeList::LimitedNodeList(unsigned short socketListenPort, unsigned short dtlsListenPort) : LimitedNodeList::LimitedNodeList(unsigned short socketListenPort, unsigned short dtlsListenPort) :
linkedDataCreateCallback(NULL),
_sessionUUID(), _sessionUUID(),
_nodeHash(), _nodeHash(),
_nodeMutex(QReadWriteLock::Recursive), _nodeMutex(QReadWriteLock::Recursive),