[DEBUG] continue removing STL

This commit is contained in:
Edouard DUPIN 2017-09-17 15:23:44 +02:00
parent e64b7496b7
commit 405604179d

View File

@ -41,21 +41,30 @@ namespace ememory {
reset(); reset();
return *this; return *this;
} }
UniquePtr& operator=(UniquePtr _obj) { UniquePtr& operator=(UniquePtr&& _obj) {
reset(); reset();
m_pointer = etk::move(_obj.release()); m_pointer = _obj.m_pointer;
_obj.m_pointer = nullptr;
return *this; return *this;
} }
/*
template <class EMEM_UPTR_TYPE_2> template <class EMEM_UPTR_TYPE_2>
UniquePtr& operator=(UniquePtr<EMEM_UPTR_TYPE_2> _obj){ UniquePtr& operator=(UniquePtr<EMEM_UPTR_TYPE_2>& _obj){
reset(); reset();
m_pointer = etk::move(_obj.m_pointer); m_pointer = _obj.m_pointer;
_obj.m_pointer = nullptr;
return *this; return *this;
} }*/
EMEM_UPTR_TYPE operator*() const{ const EMEM_UPTR_TYPE& operator*() const {
return *m_pointer; return *m_pointer;
} }
EMEM_UPTR_TYPE *operator->() const{ EMEM_UPTR_TYPE& operator*() {
return *m_pointer;
}
const EMEM_UPTR_TYPE* operator->() const {
return m_pointer;
}
EMEM_UPTR_TYPE* operator->() {
return m_pointer; return m_pointer;
} }
EMEM_UPTR_TYPE* get() const{ EMEM_UPTR_TYPE* get() const{