From 8e79c68e2904a26979135f7a6fc683c183217895 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Tue, 28 Jul 2015 11:51:48 -0500 Subject: [PATCH] make_pair was changed so that it receives by value instead of by ref since this code was written --- .../library/serverDatabase/src/shared/Loader.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/engine/server/library/serverDatabase/src/shared/Loader.cpp b/engine/server/library/serverDatabase/src/shared/Loader.cpp index fb4b5a6c..71fccf4c 100644 --- a/engine/server/library/serverDatabase/src/shared/Loader.cpp +++ b/engine/server/library/serverDatabase/src/shared/Loader.cpp @@ -320,6 +320,11 @@ void Loader::startLoadForServer(uint32 serverId) locators->pop_front(); --m_numQueuedLocators; + + delete regularLocator; + delete goldLocator; + regularLocator = NULL; + goldLocator = NULL; } snapshot->setLoadSerialNumber(++m_loadSerialNumber); @@ -651,6 +656,11 @@ void Loader::requestChunk(uint32 processId,int nodeX, int nodeZ, const std::stri if (ConfigServerDatabase::getEnableGoldDatabase()) goldLocator = new ChunkLocator(nodeX, nodeZ, sceneId, processId, false); addLocatorsForServer(processId, regularLocator, goldLocator); + + delete regularLocator; + delete goldLocator; + regularLocator = NULL; + goldLocator = NULL; } // ---------------------------------------------------------------------- @@ -931,6 +941,11 @@ void Loader::addLocatorsForServer(uint32 serverId, ObjectLocator * regularLocato NON_NULL(i->second)->push_back(std::make_pair(regularLocator, goldLocator)); ++m_numQueuedLocators; + + delete regularLocator; + delete goldLocator; + regularLocator = NULL; + goldLocator = NULL; } // ----------------------------------------------------------------------