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

Merge pull request #12972 from sethalves/fix-linux-clang-build

Browse source 
fix linux clang build
This commit is contained in:
Stephen Birarda 2018-04-26 10:46:51 -07:00 committed by GitHub
commit 9f25103b09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -715,10 +715,11 @@ SharedNodePointer LimitedNodeList::addOrUpdateNode(const QUuid& uuid, NodeType_t
// insert the new node and release our read lock // insert the new node and release our read lock
#if defined(Q_OS_ANDROID) || (defined(__clang__) && defined(Q_OS_LINUX)) #if defined(Q_OS_ANDROID) || (defined(__clang__) && defined(Q_OS_LINUX))
_nodeHash.insert(UUIDNodePair(newNode->getUUID(), newNodePointer)); _nodeHash.insert(UUIDNodePair(newNode->getUUID(), newNodePointer));
_localIDMap.insert(std::pair<Node::LocalID, SharedNodePointer>(localID, newNodePointer));
#else #else
_nodeHash.emplace(newNode->getUUID(), newNodePointer); _nodeHash.emplace(newNode->getUUID(), newNodePointer);
#endif
_localIDMap.emplace(localID, newNodePointer); _localIDMap.emplace(localID, newNodePointer);
#endif
readLocker.unlock(); readLocker.unlock();
qCDebug(networking) << "Added" << *newNode; qCDebug(networking) << "Added" << *newNode;