finish removing the SOE memory management

engine/server/application/CentralServer/src/CMakeLists.txt

@@ -132,7 +132,7 @@ include_directories(
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMathArchive/include/public
-    ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+    
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -171,7 +171,7 @@ target_link_libraries(CentralServer
     sharedGame
     sharedLog
     sharedMath
-    sharedMemoryManager
+    
     sharedMessageDispatch
     sharedNetwork
     sharedNetworkMessages

engine/server/application/CentralServer/src/shared/FirstCentralServer.h

@@ -12,7 +12,7 @@
 
 #include "sharedFoundation/FirstSharedFoundation.h"
 #include "sharedDebug/FirstSharedDebug.h"
-#include "sharedMemoryManager/FirstSharedMemoryManager.h"
+
 #include "sharedFoundation/NetworkIdArchive.h"
 
 #include "CentralServer.h"

engine/server/application/ChatServer/src/CMakeLists.txt

@@ -50,7 +50,7 @@ include_directories(
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMathArchive/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -83,7 +83,7 @@ target_link_libraries(ChatServer
     sharedFoundation
     sharedLog
     sharedMath
-    sharedMemoryManager
+    
     sharedMessageDispatch
     sharedNetwork
     sharedNetworkMessages

engine/server/application/CommoditiesServer/src/CMakeLists.txt

@@ -44,7 +44,7 @@ include_directories(
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedGame/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
-    ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+    
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -75,7 +75,7 @@ target_link_libraries(CommoditiesServer
     sharedFile
     sharedFoundation
     sharedGame
-    sharedMemoryManager
+    
     sharedLog
     sharedMessageDispatch
     sharedNetwork

engine/server/application/ConnectionServer/src/CMakeLists.txt

@@ -47,7 +47,7 @@ include_directories(
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMathArchive/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -83,7 +83,7 @@ target_link_libraries(ConnectionServer
     sharedGame
     sharedLog
     sharedMath
-    sharedMemoryManager
+    
     sharedMessageDispatch
     sharedNetwork
     sharedNetworkMessages

engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp

@@ -45,7 +45,7 @@
 #include "sharedLog/Log.h"
 #include "sharedLog/LogManager.h"
 #include "sharedLog/SetupSharedLog.h"
-#include "sharedMemoryManager/MemoryManager.h"
+
 #include "sharedNetwork/NetworkSetupData.h"
 #include "sharedNetwork/Service.h"
 #include "sharedNetwork/UdpSock.h"

engine/server/application/ConnectionServer/src/shared/FirstConnectionServer.h

@@ -11,7 +11,7 @@
 // ======================================================================
 
 #include "sharedFoundation/FirstSharedFoundation.h"
-#include "sharedMemoryManager/FirstSharedMemoryManager.h"
+
 #include "sharedDebug/FirstSharedDebug.h"
 #include "ConnectionServer.h"
 #include "sharedFoundation/NetworkIdArchive.h"

engine/server/application/CustomerServiceServer/src/CMakeLists.txt

@@ -40,7 +40,7 @@ include_directories(
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMathArchive/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -69,7 +69,7 @@ target_link_libraries(CustomerServiceServer
     sharedFoundation
     sharedLog
     sharedMath
-    sharedMemoryManager
+    
     sharedMessageDispatch
     sharedNetwork
     sharedNetworkMessages

engine/server/application/LogServer/src/CMakeLists.txt

@@ -35,7 +35,7 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -61,7 +61,7 @@ target_link_libraries(LogServer
     sharedFoundation
     sharedLog
     sharedMath
-    sharedMemoryManager
+    
     sharedMessageDispatch
     sharedNetwork
     sharedNetworkMessages

engine/server/application/LoginPing/src/CMakeLists.txt

@@ -25,7 +25,7 @@ include_directories(
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFile/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
-    ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+    
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -45,7 +45,7 @@ target_link_libraries(LoginPing
     sharedDebug
     sharedFile
     sharedFoundation
-    sharedMemoryManager
+    
     sharedMessageDispatch
     sharedNetwork
     sharedNetworkMessages

engine/server/application/LoginServer/src/CMakeLists.txt

@@ -90,7 +90,7 @@ include_directories(
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedGame/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
-    ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+    
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -129,7 +129,7 @@ target_link_libraries(LoginServer
     sharedGame
     sharedLog
     sharedMath
-    sharedMemoryManager
+    
     sharedMessageDispatch
     sharedNetwork
     sharedNetworkMessages

engine/server/application/LoginServer/src/shared/FirstLoginServer.h

@@ -15,7 +15,7 @@
 #include "Archive/ByteStream.h"
 #include "serverUtility/ServerConnection.h"
 #include "sharedDebug/FirstSharedDebug.h"
-#include "sharedMemoryManager/FirstSharedMemoryManager.h"
+
 #include "LoginServer.h"
 #include "sharedNetworkMessages/GameNetworkMessage.h"
 // ======================================================================

engine/server/application/LoginServer/src/shared/LoginServer.cpp

@@ -60,7 +60,7 @@
 #include "sharedGame/PlatformFeatureBits.h"
 #include "sharedLog/Log.h"
 #include "sharedLog/SetupSharedLog.h"
-#include "sharedMemoryManager/MemoryManager.h"
+
 #include "sharedNetwork/Address.h"
 #include "sharedNetwork/NetworkSetupData.h"
 #include "sharedNetworkMessages/ClientCentralMessages.h"

engine/server/application/MetricsServer/src/CMakeLists.txt

@@ -29,7 +29,7 @@ include_directories(
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFile/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
-    ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+    
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -54,7 +54,7 @@ target_link_libraries(MetricsServer
     sharedFoundation
     sharedLog
     sharedMath
-    sharedMemoryManager
+    
     sharedMessageDispatch
     sharedNetwork
     sharedNetworkMessages

engine/server/application/PlanetServer/src/CMakeLists.txt

@@ -53,7 +53,7 @@ include_directories(
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMathArchive/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -86,7 +86,7 @@ target_link_libraries(PlanetServer
     sharedFoundation
     sharedLog
     sharedMath
-    sharedMemoryManager
+    
     sharedMessageDispatch
     sharedNetwork
     sharedNetworkMessages

engine/server/application/PlanetServer/src/shared/FirstPlanetServer.h

@@ -12,7 +12,7 @@
 
 #include "sharedFoundation/FirstSharedFoundation.h"
 #include "sharedDebug/FirstSharedDebug.h"
-#include "sharedMemoryManager/FirstSharedMemoryManager.h"
+
 
 #include "sharedFoundation/NetworkIdArchive.h"
 

engine/server/application/ServerConsole/src/CMakeLists.txt

@@ -27,7 +27,7 @@ include_directories(
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFile/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
-    ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+    
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -45,7 +45,7 @@ target_link_libraries(ServerConsole
     sharedDebug
     sharedFile
     sharedFoundation
-    sharedMemoryManager
+    
     sharedMessageDispatch
     sharedNetwork
     sharedNetworkMessages

engine/server/application/StationPlayersCollector/src/CMakeLists.txt

@@ -31,7 +31,7 @@ include_directories(
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
-    ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+    
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -58,7 +58,7 @@ target_link_libraries(StationPlayersCollector
     sharedFile
     sharedFoundation
     sharedLog
-    sharedMemoryManager
+    
     sharedMessageDispatch
     sharedNetwork
     sharedNetworkMessages

engine/server/application/TaskManager/src/CMakeLists.txt

@@ -61,7 +61,7 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -86,7 +86,7 @@ target_link_libraries(TaskManager
     sharedFoundation
     sharedLog
     sharedMath
-    sharedMemoryManager
+    
     sharedMessageDispatch
     sharedNetwork
     sharedNetworkMessages

engine/server/application/TransferServer/src/CMakeLists.txt

@@ -35,7 +35,7 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
     ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -61,7 +61,7 @@ target_link_libraries(TransferServer
     sharedFoundation
     sharedLog
     sharedMath
-    sharedMemoryManager
+    
     sharedMessageDispatch
     sharedNetwork
     sharedNetworkMessages

engine/server/library/serverBase/src/CMakeLists.txt

@@ -16,7 +16,7 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public

engine/server/library/serverDatabase/src/CMakeLists.txt

@@ -151,7 +151,7 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMathArchive/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public

engine/server/library/serverDatabase/src/shared/FirstServerDatabase.h

@@ -2,6 +2,6 @@
 #define INCLUDED_FirstServerDatabase_H
 
 #include "sharedFoundation/FirstSharedFoundation.h"
-#include "sharedMemoryManager/FirstSharedMemoryManager.h"
+
 
 #endif

engine/server/library/serverDatabase/src/shared/Persister.cpp

@@ -174,15 +174,44 @@ Persister::~Persister()
 {
 	DEBUG_FATAL(taskQueue,("Call shutdown() before deleting Persister.\n"));
 
-	ServerSnapshotMap::iterator i;
-	for (i=m_currentSnapshots.begin(); i!=m_currentSnapshots.end(); ++i)
+	for (auto i = m_currentSnapshots.begin(); i!=m_currentSnapshots.end(); ++i) {
 		delete i->second;
-	for (i=m_newObjectSnapshots.begin(); i!=m_newObjectSnapshots.end(); ++i)
+		i->second = nullptr;
+	}
+	
+	for (auto i = m_newObjectSnapshots.begin(); i!=m_newObjectSnapshots.end(); ++i) {
 		delete i->second;
+		i->second = nullptr;
+	}
+
+	for (auto i = m_newCharacterSnapshots.begin(); i!=m_newCharacterSnapshots.end(); ++i) {
+		delete i->second;
+		i->second = nullptr;
+	}
+
+        for (auto i = m_objectSnapshotMap.begin(); i!=m_objectSnapshotMap.end(); ++i) {
+                delete i->second;
+                i->second = nullptr;
+        }
+
+        for (auto i = m_savingSnapshots.begin(); i!=m_savingSnapshots.end(); ++i) {
+                delete *i;
+                *i = nullptr;
+        }
+
+        for (auto i = m_savingCharacterSnapshots.begin(); i!=m_savingCharacterSnapshots.end(); ++i) {
+                delete *i;
+                *i = nullptr;
+        }
 
 	m_currentSnapshots.clear();
 	m_newObjectSnapshots.clear();
 	m_objectSnapshotMap.clear();
+	
+	delete m_messageSnapshot;
+	delete m_commoditiesSnapshot;
+	delete m_arbitraryGameDataSnapshot;
+
 	m_messageSnapshot = nullptr;
 	m_commoditiesSnapshot = nullptr;
 	m_arbitraryGameDataSnapshot = nullptr;

engine/server/library/serverDatabase/src/shared/Snapshot.cpp

@@ -50,8 +50,11 @@ Snapshot::~Snapshot()
 		*j = nullptr;
 	}
 
+	m_locatorList.clear();
+	m_customStepList.clear();
+
 	++ms_deletionCount;
-	LOG("Snapshot",("Deleted snapshot.  %i outstanding, %i created, %i deleted", ms_creationCount-ms_deletionCount,ms_creationCount,ms_deletionCount));	
+	LOG("Snapshot",("Deleted snapshot.  %i outstanding, %i created, %i deleted", ms_creationCount-ms_deletionCount,ms_creationCount,ms_deletionCount));
 }
 
 // ----------------------------------------------------------------------

engine/server/library/serverDatabase/src/shared/TaskSaveSnapshot.cpp

@@ -30,6 +30,9 @@ void TaskSaveSnapshot::onComplete()
 {
 	m_snapshot->saveCompleted();
 	Persister::getInstance().saveCompleted(m_snapshot);
+
+	delete m_snapshot;
+	m_snapshot = nullptr;
 }
 
 // ======================================================================

engine/server/library/serverGame/src/CMakeLists.txt

@@ -732,7 +732,7 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMathArchive/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public

engine/server/library/serverGame/src/shared/object/TangibleObject.cpp

@@ -566,7 +566,6 @@ TangibleObject::~TangibleObject()
 				const int maxStackDepth   = 64;
 				const int callStackSize = callStackOffset + maxStackDepth;
 				uint32 callStack[callStackOffset + maxStackDepth];
-				DebugHelp::getCallStack(callStack, callStackOffset + maxStackDepth);
 
 				// look up the caller's file and line
 				if (callStack[callStackOffset])
@@ -579,10 +578,7 @@ TangibleObject::~TangibleObject()
 					{
 						if (callStack[i])
 						{
-							if (DebugHelp::lookupAddress(callStack[i], lib, file, sizeof(file), line))
 								REPORT_LOG(true, ("\t%s(%d) : caller %d\n", file, line, i-callStackOffset));
-							else
-								REPORT_LOG(true, ("\tunknown(0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset));
 						}
 					}
 				}

engine/server/library/serverKeyShare/src/CMakeLists.txt

@@ -20,7 +20,7 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedDebug/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedRandom/include/public
 	${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include
 	${SWG_EXTERNALS_SOURCE_DIR}/ours/library/crypto/include

engine/server/library/serverKeyShare/src/shared/FirstServerKeyShare.h

@@ -12,7 +12,7 @@
 
 #include "sharedFoundation/FirstSharedFoundation.h"
 #include "sharedDebug/FirstSharedDebug.h"
-#include "sharedMemoryManager/FirstSharedMemoryManager.h"
+
 #include "serverKeyShare/KeyServer.h"
 #include "sharedRandom/RandomGenerator.h"
 

engine/server/library/serverMetrics/src/CMakeLists.txt

@@ -24,7 +24,7 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedDebug/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public

engine/server/library/serverNetworkMessages/src/CMakeLists.txt

@@ -492,7 +492,7 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedGame/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMathArchive/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public

engine/server/library/serverPathfinding/src/CMakeLists.txt

@@ -43,7 +43,7 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedGame/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMathArchive/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedObject/include/public

engine/server/library/serverScript/src/CMakeLists.txt

@@ -112,7 +112,7 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMathArchive/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public

engine/server/library/serverScript/src/shared/FirstServerScript.h

@@ -2,7 +2,7 @@
 #define INCLUDED_FirstServerScript_H
 
 #include "sharedFoundation/FirstSharedFoundation.h"
-#include "sharedMemoryManager/FirstSharedMemoryManager.h"
+
 
 #include "StringId.h"
 #include <memory>

engine/server/library/serverUtility/src/CMakeLists.txt

@@ -49,7 +49,7 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMathArchive/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public

engine/server/library/serverUtility/src/shared/FirstServerUtility.h

@@ -3,6 +3,6 @@
 
 #include "sharedFoundation/FirstSharedFoundation.h"
 #include "sharedDebug/FirstSharedDebug.h"
-#include "sharedMemoryManager/FirstSharedMemoryManager.h"
+
 
 #endif