Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-01 17:23:49 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-04 08:28:23 (GMT) |
| commit | 741c45b74d5f634622eb5f757c49323274fb8937 (patch) | |
| tree | b9cfa6c2fe2e79e03cc8cb7c1ca1e9cf45aa5328 /Sluift/LuaElementConvertors.h | |
| parent | eddd92ed76ae68cb1e202602fd3ebd11b69191a2 (diff) | |
| download | swift-741c45b74d5f634622eb5f757c49323274fb8937.zip swift-741c45b74d5f634622eb5f757c49323274fb8937.tar.bz2 | |
Modernize code to use C++11 shared_ptr instead of Boost's
This change was done by applying the following 'gsed'
replacement calls to all source files:
's/\#include <boost\/shared_ptr\.hpp>/\#include <memory>/g'
's/\#include <boost\/enable_shared_from_this\.hpp>/\#include <memory>/g'
's/\#include <boost\/smart_ptr\/make_shared\.hpp>/\#include <memory>/g'
's/\#include <boost\/make_shared\.hpp>/\#include <memory>/g'
's/\#include <boost\/weak_ptr\.hpp>/\#include <memory>/g'
's/boost::make_shared/std::make_shared/g'
's/boost::dynamic_pointer_cast/std::dynamic_pointer_cast/g'
's/boost::shared_ptr/std::shared_ptr/g'
's/boost::weak_ptr/std::weak_ptr/g'
's/boost::enable_shared_from_this/std::enable_shared_from_this/g'
The remaining issues have been fixed manually.
Test-Information:
Code builds on OS X 10.11.4 and unit tests pass.
Change-Id: Ia7ae34eab869fb9ad6387a1348426b71ae4acd5f
Diffstat (limited to 'Sluift/LuaElementConvertors.h')
| -rw-r--r-- | Sluift/LuaElementConvertors.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Sluift/LuaElementConvertors.h b/Sluift/LuaElementConvertors.h index 6b3d343..8e1d10b 100644 --- a/Sluift/LuaElementConvertors.h +++ b/Sluift/LuaElementConvertors.h @@ -6,10 +6,10 @@ #pragma once +#include <memory> #include <vector> #include <boost/optional.hpp> -#include <boost/shared_ptr.hpp> #include <Swiften/Base/Override.h> @@ -24,29 +24,29 @@ namespace Swift { LuaElementConvertors(); virtual ~LuaElementConvertors(); - boost::shared_ptr<Element> convertFromLua(lua_State*, int index); - int convertToLua(lua_State*, boost::shared_ptr<Element>); + std::shared_ptr<Element> convertFromLua(lua_State*, int index); + int convertToLua(lua_State*, std::shared_ptr<Element>); /** * Adds a toplevel type+data table with the given type. */ - boost::shared_ptr<Element> convertFromLuaUntyped(lua_State*, int index, const std::string& type); + std::shared_ptr<Element> convertFromLuaUntyped(lua_State*, int index, const std::string& type); /** * Strips the toplevel type+data table, and only return the * data. */ - int convertToLuaUntyped(lua_State*, boost::shared_ptr<Element>); + int convertToLuaUntyped(lua_State*, std::shared_ptr<Element>); - const std::vector< boost::shared_ptr<LuaElementConvertor> >& getConvertors() const { + const std::vector< std::shared_ptr<LuaElementConvertor> >& getConvertors() const { return convertors; } private: - boost::optional<std::string> doConvertToLuaUntyped(lua_State*, boost::shared_ptr<Element>); + boost::optional<std::string> doConvertToLuaUntyped(lua_State*, std::shared_ptr<Element>); void registerConvertors(); private: - std::vector< boost::shared_ptr<LuaElementConvertor> > convertors; + std::vector< std::shared_ptr<LuaElementConvertor> > convertors; }; } |