mirror of
https://github.com/SWG-Source/src.git
synced 2026-07-28 22:15:49 -04:00
[apathy] [PATCH] Replace boost::shared_ptr with std::shared_ptr
This commit is contained in:
@@ -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 <memory>
|
||||
|
||||
#endif
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -44,7 +44,7 @@ class ScriptDictionary;
|
||||
class ScriptMessage;
|
||||
class ScriptParams;
|
||||
class ServerObject;
|
||||
typedef boost::shared_ptr<ScriptDictionary> ScriptDictionaryPtr;
|
||||
typedef std::shared_ptr<ScriptDictionary> ScriptDictionaryPtr;
|
||||
|
||||
struct ScriptData
|
||||
{
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
|
||||
#include <jni.h>
|
||||
#include "serverScript/ScriptDictionary.h"
|
||||
#include <memory>
|
||||
|
||||
namespace boost
|
||||
{
|
||||
@@ -33,22 +34,22 @@ class GlobalArrayRef;
|
||||
class JavaStringParam;
|
||||
class JavaString;
|
||||
class JavaDictionary;
|
||||
typedef boost::shared_ptr<LocalRefParam> LocalRefParamPtr;
|
||||
typedef boost::shared_ptr<LocalArrayRefParam> LocalArrayRefParamPtr;
|
||||
typedef boost::shared_ptr<LocalObjectArrayRefParam> LocalObjectArrayRefParamPtr;
|
||||
typedef boost::shared_ptr<LocalRef> LocalRefPtr;
|
||||
typedef boost::shared_ptr<LocalArrayRef> LocalArrayRefPtr;
|
||||
typedef boost::shared_ptr<LocalObjectArrayRef> LocalObjectArrayRefPtr;
|
||||
typedef boost::shared_ptr<LocalByteArrayRef> LocalByteArrayRefPtr;
|
||||
typedef boost::shared_ptr<LocalIntArrayRef> LocalIntArrayRefPtr;
|
||||
typedef boost::shared_ptr<LocalFloatArrayRef> LocalFloatArrayRefPtr;
|
||||
typedef boost::shared_ptr<LocalBooleanArrayRef> LocalBooleanArrayRefPtr;
|
||||
typedef boost::shared_ptr<LocalLongArrayRef> LocalLongArrayRefPtr;
|
||||
typedef boost::shared_ptr<GlobalRef> GlobalRefPtr;
|
||||
typedef boost::shared_ptr<GlobalArrayRef> GlobalArrayRefPtr;
|
||||
typedef boost::shared_ptr<JavaStringParam> JavaStringParamPtr;
|
||||
typedef boost::shared_ptr<JavaString> JavaStringPtr;
|
||||
typedef boost::shared_ptr<JavaDictionary> JavaDictionaryPtr;
|
||||
typedef std::shared_ptr<LocalRefParam> LocalRefParamPtr;
|
||||
typedef std::shared_ptr<LocalArrayRefParam> LocalArrayRefParamPtr;
|
||||
typedef std::shared_ptr<LocalObjectArrayRefParam> LocalObjectArrayRefParamPtr;
|
||||
typedef std::shared_ptr<LocalRef> LocalRefPtr;
|
||||
typedef std::shared_ptr<LocalArrayRef> LocalArrayRefPtr;
|
||||
typedef std::shared_ptr<LocalObjectArrayRef> LocalObjectArrayRefPtr;
|
||||
typedef std::shared_ptr<LocalByteArrayRef> LocalByteArrayRefPtr;
|
||||
typedef std::shared_ptr<LocalIntArrayRef> LocalIntArrayRefPtr;
|
||||
typedef std::shared_ptr<LocalFloatArrayRef> LocalFloatArrayRefPtr;
|
||||
typedef std::shared_ptr<LocalBooleanArrayRef> LocalBooleanArrayRefPtr;
|
||||
typedef std::shared_ptr<LocalLongArrayRef> LocalLongArrayRefPtr;
|
||||
typedef std::shared_ptr<GlobalRef> GlobalRefPtr;
|
||||
typedef std::shared_ptr<GlobalArrayRef> GlobalArrayRefPtr;
|
||||
typedef std::shared_ptr<JavaStringParam> JavaStringParamPtr;
|
||||
typedef std::shared_ptr<JavaString> JavaStringPtr;
|
||||
typedef std::shared_ptr<JavaDictionary> JavaDictionaryPtr;
|
||||
|
||||
|
||||
//========================================================================
|
||||
|
||||
@@ -42,7 +42,7 @@ private:
|
||||
ScriptDictionary(const ScriptDictionary &);
|
||||
ScriptDictionary & operator = (const ScriptDictionary &);
|
||||
};
|
||||
typedef boost::shared_ptr<ScriptDictionary> ScriptDictionaryPtr;
|
||||
typedef std::shared_ptr<ScriptDictionary> ScriptDictionaryPtr;
|
||||
|
||||
|
||||
inline ScriptDictionary::ScriptDictionary(void)
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user