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/Lua | |
| 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/Lua')
| -rw-r--r-- | Sluift/Lua/Value.cpp | 4 | ||||
| -rw-r--r-- | Sluift/Lua/Value.h | 31 |
2 files changed, 17 insertions, 18 deletions
diff --git a/Sluift/Lua/Value.cpp b/Sluift/Lua/Value.cpp index dd61d59..ed776c1 100644 --- a/Sluift/Lua/Value.cpp +++ b/Sluift/Lua/Value.cpp @@ -47,9 +47,9 @@ namespace { } } - void operator()(const std::map<std::string, boost::shared_ptr<Value> >& table) const { + void operator()(const std::map<std::string, std::shared_ptr<Value> >& table) const { lua_createtable(state, 0, boost::numeric_cast<int>(table.size())); - for(std::map<std::string, boost::shared_ptr<Value> >::const_iterator i = table.begin(); i != table.end(); ++i) { + for(std::map<std::string, std::shared_ptr<Value> >::const_iterator i = table.begin(); i != table.end(); ++i) { boost::apply_visitor(PushVisitor(state), *i->second); lua_setfield(state, -2, i->first.c_str()); } diff --git a/Sluift/Lua/Value.h b/Sluift/Lua/Value.h index f525fb8..13c4a0c 100644 --- a/Sluift/Lua/Value.h +++ b/Sluift/Lua/Value.h @@ -7,11 +7,10 @@ #pragma once #include <map> +#include <memory> #include <string> #include <vector> -#include <boost/shared_ptr.hpp> -#include <boost/smart_ptr/make_shared.hpp> #include <boost/variant.hpp> struct lua_State; @@ -26,34 +25,34 @@ namespace Swift { int, std::string, std::vector< boost::recursive_variant_ >, - std::map<std::string, boost::shared_ptr<boost::recursive_variant_> > + std::map<std::string, std::shared_ptr<boost::recursive_variant_> > >::type Value; - typedef std::map<std::string, boost::shared_ptr<Value> > Table; + typedef std::map<std::string, std::shared_ptr<Value> > Table; typedef std::vector<Value> Array; - inline boost::shared_ptr<Value> nilRef() { - return boost::make_shared<Value>(Nil()); + inline std::shared_ptr<Value> nilRef() { + return std::make_shared<Value>(Nil()); } - inline boost::shared_ptr<Value> valueRef(const std::string& value) { - return boost::make_shared<Value>(value); + inline std::shared_ptr<Value> valueRef(const std::string& value) { + return std::make_shared<Value>(value); } - inline boost::shared_ptr<Value> intRef(int value) { - return boost::make_shared<Value>(value); + inline std::shared_ptr<Value> intRef(int value) { + return std::make_shared<Value>(value); } - inline boost::shared_ptr<Value> boolRef(bool value) { - return boost::make_shared<Value>(value); + inline std::shared_ptr<Value> boolRef(bool value) { + return std::make_shared<Value>(value); } - inline boost::shared_ptr<Value> valueRef(const Table& table) { - return boost::make_shared<Value>(table); + inline std::shared_ptr<Value> valueRef(const Table& table) { + return std::make_shared<Value>(table); } - inline boost::shared_ptr<Value> valueRef(const Array& array) { - return boost::make_shared<Value>(array); + inline std::shared_ptr<Value> valueRef(const Array& array) { + return std::make_shared<Value>(array); } void pushValue(lua_State* state, const Value& value); |