generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move to unique_ptr for Any implemenation

Browse Source 
Speed and size improvements
This commit is contained in:
Jason Turner 2014-08-15 20:38:35 -06:00
parent c5f6c549ec
commit 5692dfc58a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/chaiscript/dispatchkit/any.hpp
View File

@ -47,7 +47,7 @@ namespace chaiscript {
virtual ~Data() {} virtual ~Data() {}
virtual void *data() = 0; virtual void *data() = 0;
virtual const std::type_info &type() const = 0; virtual const std::type_info &type() const = 0;
virtual std::shared_ptr<Data> clone() const = 0; virtual std::unique_ptr<Data> clone() const = 0;
}; };
template<typename T> template<typename T>
@ -71,9 +71,9 @@ namespace chaiscript {
return m_type; return m_type;
} }
std::shared_ptr<Data> clone() const CHAISCRIPT_OVERRIDE std::unique_ptr<Data> clone() const CHAISCRIPT_OVERRIDE
{ {
return std::shared_ptr<Data>(new Data_Impl<T>(m_data)); return std::unique_ptr<Data>(new Data_Impl<T>(m_data));
} }
Data_Impl &operator=(const Data_Impl&) = delete; Data_Impl &operator=(const Data_Impl&) = delete;
@ -82,7 +82,7 @@ namespace chaiscript {
T m_data; T m_data;
}; };
std::shared_ptr<Data> m_data; std::unique_ptr<Data> m_data;
public: public:
// construct/copy/destruct // construct/copy/destruct
@ -100,7 +100,7 @@ namespace chaiscript {
template<typename ValueType> template<typename ValueType>
Any(const ValueType &t_value) Any(const ValueType &t_value)
: m_data(std::shared_ptr<Data>(new Data_Impl<ValueType>(t_value))) : m_data(std::unique_ptr<Data>(new Data_Impl<ValueType>(t_value)))
{ {
} }
@ -114,7 +114,7 @@ namespace chaiscript {
template<typename ValueType> template<typename ValueType>
Any & operator=(const ValueType &t_value) Any & operator=(const ValueType &t_value)
{ {
m_data = std::shared_ptr<Data>(new Data_Impl<ValueType>(t_value)); m_data = std::unique_ptr<Data>(new Data_Impl<ValueType>(t_value));
return *this; return *this;
} }
@ -138,9 +138,7 @@ namespace chaiscript {
// modifiers // modifiers
Any & swap(Any &t_other) Any & swap(Any &t_other)
{ {
std::shared_ptr<Data> data = t_other.m_data; std::swap(t_other.m_data, m_data);
t_other.m_data = m_data;
m_data = data;
return *this; return *this;
} }