diff --git a/engine/server/library/serverScript/src/shared/FirstServerScript.h b/engine/server/library/serverScript/src/shared/FirstServerScript.h index 0e096798..5735b6b2 100755 --- a/engine/server/library/serverScript/src/shared/FirstServerScript.h +++ b/engine/server/library/serverScript/src/shared/FirstServerScript.h @@ -1,10 +1,10 @@ #ifndef INCLUDED_FirstServerScript_H #define INCLUDED_FirstServerScript_H -#include "boost/smart_ptr.hpp" #include "sharedFoundation/FirstSharedFoundation.h" #include "sharedMemoryManager/FirstSharedMemoryManager.h" #include "StringId.h" +#include #endif diff --git a/engine/server/library/serverScript/src/shared/GameScriptObject.cpp b/engine/server/library/serverScript/src/shared/GameScriptObject.cpp index 3e8e9396..ab118b52 100755 --- a/engine/server/library/serverScript/src/shared/GameScriptObject.cpp +++ b/engine/server/library/serverScript/src/shared/GameScriptObject.cpp @@ -9,7 +9,6 @@ #include "serverScript/FirstServerScript.h" #include "serverScript/GameScriptObject.h" -#include "boost/smart_ptr.hpp" #include "ScriptMessage.h" #include "serverGame/ConfigServerGame.h" #include "serverGame/ServerController.h" diff --git a/engine/server/library/serverScript/src/shared/GameScriptObject.h b/engine/server/library/serverScript/src/shared/GameScriptObject.h index 13947145..3926c42b 100755 --- a/engine/server/library/serverScript/src/shared/GameScriptObject.h +++ b/engine/server/library/serverScript/src/shared/GameScriptObject.h @@ -44,7 +44,7 @@ class ScriptDictionary; class ScriptMessage; class ScriptParams; class ServerObject; -typedef boost::shared_ptr ScriptDictionaryPtr; +typedef std::shared_ptr ScriptDictionaryPtr; struct ScriptData { diff --git a/engine/server/library/serverScript/src/shared/JNIWrappers.h b/engine/server/library/serverScript/src/shared/JNIWrappers.h index b664ccd2..9fe29627 100755 --- a/engine/server/library/serverScript/src/shared/JNIWrappers.h +++ b/engine/server/library/serverScript/src/shared/JNIWrappers.h @@ -11,6 +11,7 @@ #include #include "serverScript/ScriptDictionary.h" +#include namespace boost { @@ -33,22 +34,22 @@ class GlobalArrayRef; class JavaStringParam; class JavaString; class JavaDictionary; -typedef boost::shared_ptr LocalRefParamPtr; -typedef boost::shared_ptr LocalArrayRefParamPtr; -typedef boost::shared_ptr LocalObjectArrayRefParamPtr; -typedef boost::shared_ptr LocalRefPtr; -typedef boost::shared_ptr LocalArrayRefPtr; -typedef boost::shared_ptr LocalObjectArrayRefPtr; -typedef boost::shared_ptr LocalByteArrayRefPtr; -typedef boost::shared_ptr LocalIntArrayRefPtr; -typedef boost::shared_ptr LocalFloatArrayRefPtr; -typedef boost::shared_ptr LocalBooleanArrayRefPtr; -typedef boost::shared_ptr LocalLongArrayRefPtr; -typedef boost::shared_ptr GlobalRefPtr; -typedef boost::shared_ptr GlobalArrayRefPtr; -typedef boost::shared_ptr JavaStringParamPtr; -typedef boost::shared_ptr JavaStringPtr; -typedef boost::shared_ptr JavaDictionaryPtr; +typedef std::shared_ptr LocalRefParamPtr; +typedef std::shared_ptr LocalArrayRefParamPtr; +typedef std::shared_ptr LocalObjectArrayRefParamPtr; +typedef std::shared_ptr LocalRefPtr; +typedef std::shared_ptr LocalArrayRefPtr; +typedef std::shared_ptr LocalObjectArrayRefPtr; +typedef std::shared_ptr LocalByteArrayRefPtr; +typedef std::shared_ptr LocalIntArrayRefPtr; +typedef std::shared_ptr LocalFloatArrayRefPtr; +typedef std::shared_ptr LocalBooleanArrayRefPtr; +typedef std::shared_ptr LocalLongArrayRefPtr; +typedef std::shared_ptr GlobalRefPtr; +typedef std::shared_ptr GlobalArrayRefPtr; +typedef std::shared_ptr JavaStringParamPtr; +typedef std::shared_ptr JavaStringPtr; +typedef std::shared_ptr JavaDictionaryPtr; //======================================================================== diff --git a/engine/server/library/serverScript/src/shared/ScriptDictionary.h b/engine/server/library/serverScript/src/shared/ScriptDictionary.h index 5b689226..4a547d34 100755 --- a/engine/server/library/serverScript/src/shared/ScriptDictionary.h +++ b/engine/server/library/serverScript/src/shared/ScriptDictionary.h @@ -42,7 +42,7 @@ private: ScriptDictionary(const ScriptDictionary &); ScriptDictionary & operator = (const ScriptDictionary &); }; -typedef boost::shared_ptr ScriptDictionaryPtr; +typedef std::shared_ptr ScriptDictionaryPtr; inline ScriptDictionary::ScriptDictionary(void) diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsWorldInfo.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsWorldInfo.cpp index ca3d5b8d..5c0714b7 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsWorldInfo.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsWorldInfo.cpp @@ -11,7 +11,6 @@ #include "serverScript/JavaLibrary.h" #include "UnicodeUtils.h" -#include "boost/smart_ptr.hpp" // for boost::shared_ptr and friends #include "serverGame/ContainerInterface.h" #include "sharedDebug/Profiler.h" #include "serverGame/CreatureObject.h"