gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Warn when shared_object_ptr misused

This commit is contained in:
Eduardo Bart 2013-02-28 12:19:42 -03:00
parent e528fcc8f8
commit 69e762385e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/framework/otml/otmlnode.h
View File

@ -47,7 +47,7 @@ public:
bool hasChildAt(const std::string& childTag) { return !!get(childTag); } bool hasChildAt(const std::string& childTag) { return !!get(childTag); }
bool hasChildAtIndex(int childIndex) { return !!getIndex(childIndex); } bool hasChildAtIndex(int childIndex) { return !!getIndex(childIndex); }
void setTag(std::string tag) { m_tag = tag; } void setTag(const std::string& tag) { m_tag = tag; }
void setValue(const std::string& value) { m_value = value; } void setValue(const std::string& value) { m_value = value; }
void setNull(bool null) { m_null = null; } void setNull(bool null) { m_null = null; }
void setUnique(bool unique) { m_unique = unique; } void setUnique(bool unique) { m_unique = unique; }

6
src/framework/stdext/shared_object.h
View File

@ -59,7 +59,11 @@ public:
typedef T element_type; typedef T element_type;
shared_object_ptr(): px(nullptr) { } shared_object_ptr(): px(nullptr) { }
shared_object_ptr(T* p, bool add_ref = true) : px(p) { if(px != nullptr && add_ref) this->add_ref(); } shared_object_ptr(T* p, bool add_ref = true) : px(p) {
static_assert(std::is_base_of<shared_object, T>::value, "classes using shared_object_ptr must be a derived of stdext::shared_object");
if(px != nullptr && add_ref)
this->add_ref();
}
shared_object_ptr(shared_object_ptr const& rhs): px(rhs.px) { if(px != nullptr) add_ref(); } shared_object_ptr(shared_object_ptr const& rhs): px(rhs.px) { if(px != nullptr) add_ref(); }
template<class U> template<class U>
shared_object_ptr(shared_object_ptr<U> const& rhs, typename std::is_convertible<U,T>::type* = nullptr) : px(rhs.get()) { if(px != nullptr) add_ref(); } shared_object_ptr(shared_object_ptr<U> const& rhs, typename std::is_convertible<U,T>::type* = nullptr) : px(rhs.get()) { if(px != nullptr) add_ref(); }