FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1065 from elsid/ref_ptr_move

Browse Source 
Add move constructor and move assignment operator to ref_ptr
This commit is contained in:
Robert Osfield 2021-05-05 08:50:32 +01:00 committed by GitHub
commit ec22aeed5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/osg/ref_ptr
View File

@ -22,6 +22,10 @@
#include <string>
#endif
#if __cplusplus >= 201103L
#include <utility>
#endif
namespace osg {
template<typename T> class observer_ptr;
@ -36,6 +40,9 @@ class ref_ptr
ref_ptr() : _ptr(0) {}
ref_ptr(T* ptr) : _ptr(ptr) { if (_ptr) _ptr->ref(); }
ref_ptr(const ref_ptr& rp) : _ptr(rp._ptr) { if (_ptr) _ptr->ref(); }
#if __cplusplus >= 201103L
ref_ptr(ref_ptr&& rp) noexcept : _ptr(rp._ptr) { rp._ptr = 0; }
#endif
template<class Other> ref_ptr(const ref_ptr<Other>& rp) : _ptr(rp._ptr) { if (_ptr) _ptr->ref(); }
ref_ptr(observer_ptr<T>& optr) : _ptr(0) { optr.lock(*this); }
~ref_ptr() { if (_ptr) _ptr->unref(); _ptr = 0; }
@ -52,6 +59,17 @@ class ref_ptr
return *this;
}
#if __cplusplus >= 201103L
template<class Other> ref_ptr& operator = (ref_ptr<Other>&& rp)
{
if (_ptr == rp._ptr) return *this;
if (_ptr != nullptr) _ptr->unref();
_ptr = rp._ptr;
rp._ptr = nullptr;
return *this;
}
#endif
inline ref_ptr& operator = (T* ptr)
{
if (_ptr==ptr) return *this;