sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(ObjectRef) Added implicit conversion constructor/operator

Browse Source 
Former-commit-id: c633956130731e84c6d15d09961cd80c8d24877a
This commit is contained in:
Lynix
2015-01-28 15:46:14 +01:00
parent 9195e162a8
commit c2d1773b41
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/ObjectRef.hpp
View File

@@ -20,6 +20,7 @@ class NzObjectRef
NzObjectRef(); NzObjectRef();
NzObjectRef(T* object); NzObjectRef(T* object);
NzObjectRef(const NzObjectRef& ref); NzObjectRef(const NzObjectRef& ref);
template<typename U> NzObjectRef(const NzObjectRef<U>& ref);
NzObjectRef(NzObjectRef&& ref) noexcept; NzObjectRef(NzObjectRef&& ref) noexcept;
~NzObjectRef(); ~NzObjectRef();
@@ -35,6 +36,7 @@ class NzObjectRef
NzObjectRef& operator=(T* object); NzObjectRef& operator=(T* object);
NzObjectRef& operator=(const NzObjectRef& ref); NzObjectRef& operator=(const NzObjectRef& ref);
template<typename U> NzObjectRef& operator=(const NzObjectRef<U>& ref);
NzObjectRef& operator=(NzObjectRef&& ref) noexcept; NzObjectRef& operator=(NzObjectRef&& ref) noexcept;
private: private:

16
include/Nazara/Core/ObjectRef.inl
View File

@@ -27,6 +27,13 @@ m_object(ref.m_object)
m_object->AddReference(); m_object->AddReference();
} }
template<typename T>
template<typename U>
NzObjectRef<T>::NzObjectRef(const NzObjectRef<U>& ref) :
NzObjectRef(ref.Get())
{
}
template<typename T> template<typename T>
NzObjectRef<T>::NzObjectRef(NzObjectRef&& ref) noexcept : NzObjectRef<T>::NzObjectRef(NzObjectRef&& ref) noexcept :
m_object(ref.m_object) m_object(ref.m_object)
@@ -124,6 +131,15 @@ NzObjectRef<T>& NzObjectRef<T>::operator=(const NzObjectRef& ref)
return *this; return *this;
} }
template<typename T>
template<typename U>
NzObjectRef<T>& NzObjectRef<T>::operator=(const NzObjectRef<U>& ref)
{
Reset(ref.Get());
return *this;
}
template<typename T> template<typename T>
NzObjectRef<T>& NzObjectRef<T>::operator=(NzObjectRef&& ref) noexcept NzObjectRef<T>& NzObjectRef<T>::operator=(NzObjectRef&& ref) noexcept
{ {