diff options
Diffstat (limited to '')
-rw-r--r-- | src/Bindings/LuaServerHandle.h | 4 | ||||
-rw-r--r-- | src/Bindings/LuaState.h | 14 | ||||
-rw-r--r-- | src/Bindings/LuaTCPLink.h | 2 | ||||
-rw-r--r-- | src/Bindings/LuaUDPEndpoint.h | 2 | ||||
-rw-r--r-- | src/Bindings/PluginManager.h | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/Bindings/LuaServerHandle.h b/src/Bindings/LuaServerHandle.h index 1aad45f52..59acdc0e7 100644 --- a/src/Bindings/LuaServerHandle.h +++ b/src/Bindings/LuaServerHandle.h @@ -18,10 +18,10 @@ // fwd: class cLuaTCPLink; -typedef SharedPtr<cLuaTCPLink> cLuaTCPLinkPtr; +typedef std::shared_ptr<cLuaTCPLink> cLuaTCPLinkPtr; typedef std::vector<cLuaTCPLinkPtr> cLuaTCPLinkPtrs; class cLuaServerHandle; -typedef SharedPtr<cLuaServerHandle> cLuaServerHandlePtr; +typedef std::shared_ptr<cLuaServerHandle> cLuaServerHandlePtr; diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h index d8f39b09e..9e354392b 100644 --- a/src/Bindings/LuaState.h +++ b/src/Bindings/LuaState.h @@ -270,8 +270,8 @@ public: Use a smart pointer for a copyable object. */ cTrackedRef(cTrackedRef &&) = delete; }; - typedef UniquePtr<cTrackedRef> cTrackedRefPtr; - typedef SharedPtr<cTrackedRef> cTrackedRefSharedPtr; + typedef std::unique_ptr<cTrackedRef> cTrackedRefPtr; + typedef std::shared_ptr<cTrackedRef> cTrackedRefSharedPtr; /** Represents a stored callback to Lua that C++ code can call. @@ -324,8 +324,8 @@ public: Use cCallbackPtr for a copyable object. */ cCallback(cCallback &&) = delete; }; - typedef UniquePtr<cCallback> cCallbackPtr; - typedef SharedPtr<cCallback> cCallbackSharedPtr; + typedef std::unique_ptr<cCallback> cCallbackPtr; + typedef std::shared_ptr<cCallback> cCallbackSharedPtr; /** Same thing as cCallback, but GetStackValue() won't fail if the callback value is nil. @@ -354,7 +354,7 @@ public: Use cCallbackPtr for a copyable object. */ cOptionalCallback(cOptionalCallback &&) = delete; }; - typedef UniquePtr<cOptionalCallback> cOptionalCallbackPtr; + typedef std::unique_ptr<cOptionalCallback> cOptionalCallbackPtr; /** Represents a stored Lua table with callback functions that C++ code can call. @@ -416,7 +416,7 @@ public: Returns true on success, false on failure (not a table at the specified stack pos). */ bool RefStack(cLuaState & a_LuaState, int a_StackPos); }; - typedef UniquePtr<cTableRef> cTableRefPtr; + typedef std::unique_ptr<cTableRef> cTableRefPtr; /** Represents a parameter that is optional - calling a GetStackValue() with this object will not fail if the value on the Lua stack is nil. @@ -539,7 +539,7 @@ public: /** The stack index where the table resides in the Lua state. */ int m_StackPos; }; - typedef UniquePtr<cStackTable> cStackTablePtr; + typedef std::unique_ptr<cStackTable> cStackTablePtr; /** Creates a new instance. The LuaState is not initialized. diff --git a/src/Bindings/LuaTCPLink.h b/src/Bindings/LuaTCPLink.h index 4211c3b64..6e5a78b4d 100644 --- a/src/Bindings/LuaTCPLink.h +++ b/src/Bindings/LuaTCPLink.h @@ -18,7 +18,7 @@ // fwd: class cLuaServerHandle; -typedef WeakPtr<cLuaServerHandle> cLuaServerHandleWPtr; +typedef std::weak_ptr<cLuaServerHandle> cLuaServerHandleWPtr; diff --git a/src/Bindings/LuaUDPEndpoint.h b/src/Bindings/LuaUDPEndpoint.h index 04c6ea134..0b37f2903 100644 --- a/src/Bindings/LuaUDPEndpoint.h +++ b/src/Bindings/LuaUDPEndpoint.h @@ -18,7 +18,7 @@ // fwd: class cLuaUDPEndpoint; -typedef SharedPtr<cLuaUDPEndpoint> cLuaUDPEndpointPtr; +typedef std::shared_ptr<cLuaUDPEndpoint> cLuaUDPEndpointPtr; diff --git a/src/Bindings/PluginManager.h b/src/Bindings/PluginManager.h index 7c818ca2d..f38ac8fa1 100644 --- a/src/Bindings/PluginManager.h +++ b/src/Bindings/PluginManager.h @@ -29,7 +29,7 @@ class cSettingsRepositoryInterface; class cDeadlockDetect; struct TakeDamageInfo; -typedef SharedPtr<cPlugin> cPluginPtr; +typedef std::shared_ptr<cPlugin> cPluginPtr; typedef std::vector<cPluginPtr> cPluginPtrs; @@ -187,7 +187,7 @@ public: ) = 0; }; - typedef SharedPtr<cCommandHandler> cCommandHandlerPtr; + typedef std::shared_ptr<cCommandHandler> cCommandHandlerPtr; /** The interface used for enumerating and extern-calling plugins */ |