From b4dc3b1b472f1fc5dc8cbedd1691ebca0d746f42 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 16 Dec 2015 11:07:19 -0800
Subject: [PATCH] Fix windows compile error.

---
 assignment-client/src/octree/OctreeServer.cpp | 2 +-
 libraries/networking/src/LimitedNodeList.cpp  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index f42431589e..75252ddf8c 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -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.
     // This ensures that we don't get any more newly connecting nodes
-    DependencyManager::get<NodeList>()->linkedDataCreateCallback = NULL;
+    DependencyManager::get<NodeList>()->linkedDataCreateCallback = nullptr;
 
     if (_octreeInboundPacketProcessor) {
         _octreeInboundPacketProcessor->terminating();
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 4419ba882a..0b194b017e 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -40,7 +40,6 @@ const char SOLO_NODE_TYPES[2] = {
 };
 
 LimitedNodeList::LimitedNodeList(unsigned short socketListenPort, unsigned short dtlsListenPort) :
-    linkedDataCreateCallback(NULL),
     _sessionUUID(),
     _nodeHash(),
     _nodeMutex(QReadWriteLock::Recursive),