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

SparsePtr: Fixed some operators not being const 

Former-commit-id: 1393ab9299502328829efb0daa0b17c1a74fdd2e
This commit is contained in:
Lynix 2014-07-12 12:48:25 +02:00
parent 8128079927
commit cf95b128c5
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/Nazara/Core/SparsePtr.hpp
View File

@ -25,12 +25,12 @@ class NzSparsePtr
void Set(void* ptr); void Set(void* ptr);
void SetStride(unsigned int stride); void SetStride(unsigned int stride);
T& operator*(); T& operator*() const;
T& operator->(); T& operator->() const;
T& operator[](unsigned int index); T& operator[](unsigned int index) const;
NzSparsePtr operator+(unsigned int count); NzSparsePtr operator+(unsigned int count) const;
NzSparsePtr operator-(unsigned int count); NzSparsePtr operator-(unsigned int count) const;
NzSparsePtr& operator+=(unsigned int count); NzSparsePtr& operator+=(unsigned int count);
NzSparsePtr& operator-=(unsigned int count); NzSparsePtr& operator-=(unsigned int count);

19
include/Nazara/Core/SparsePtr.inl
View File

@ -43,31 +43,31 @@ void NzSparsePtr<T>::SetStride(unsigned int stride)
} }
template<typename T> template<typename T>
T& NzSparsePtr<T>::operator*() T& NzSparsePtr<T>::operator*() const
{ {
return *reinterpret_cast<T*>(m_ptr); return *reinterpret_cast<T*>(m_ptr);
} }
template<typename T> template<typename T>
T& NzSparsePtr<T>::operator->() T& NzSparsePtr<T>::operator->() const
{ {
return *reinterpret_cast<T*>(m_ptr); return *reinterpret_cast<T*>(m_ptr);
} }
template<typename T> template<typename T>
T& NzSparsePtr<T>::operator[](unsigned int index) T& NzSparsePtr<T>::operator[](unsigned int index) const
{ {
return *reinterpret_cast<T*>(m_ptr + index*m_stride); return *reinterpret_cast<T*>(m_ptr + index*m_stride);
} }
template<typename T> template<typename T>
NzSparsePtr<T> NzSparsePtr<T>::operator+(unsigned int count) NzSparsePtr<T> NzSparsePtr<T>::operator+(unsigned int count) const
{ {
return NzSparsePtr(m_ptr + count*m_stride, m_stride); return NzSparsePtr(m_ptr + count*m_stride, m_stride);
} }
template<typename T> template<typename T>
NzSparsePtr<T> NzSparsePtr<T>::operator-(unsigned int count) NzSparsePtr<T> NzSparsePtr<T>::operator-(unsigned int count) const
{ {
return NzSparsePtr(m_ptr - count*m_stride, m_stride); return NzSparsePtr(m_ptr - count*m_stride, m_stride);
} }
@ -96,9 +96,13 @@ NzSparsePtr<T>& NzSparsePtr<T>::operator++()
template<typename T> template<typename T>
NzSparsePtr<T> NzSparsePtr<T>::operator++(int) NzSparsePtr<T> NzSparsePtr<T>::operator++(int)
{ {
// On fait une copie de l'objet
NzSparsePtr tmp(*this); NzSparsePtr tmp(*this);
// On modifie l'objet
operator++(); operator++();
// On retourne la copie
return tmp; return tmp;
} }
@ -112,9 +116,13 @@ NzSparsePtr<T>& NzSparsePtr<T>::operator--()
template<typename T> template<typename T>
NzSparsePtr<T> NzSparsePtr<T>::operator--(int) NzSparsePtr<T> NzSparsePtr<T>::operator--(int)
{ {
// On fait une copie de l'objet
NzSparsePtr tmp(*this); NzSparsePtr tmp(*this);
// On modifie l'objet
operator--(); operator--();
// On retourne la copie
return tmp; return tmp;
} }
@ -154,5 +162,4 @@ bool NzSparsePtr<T>::operator>=(const NzSparsePtr& ptr) const
return m_ptr >= ptr.m_ptr; return m_ptr >= ptr.m_ptr;
} }
#include <Nazara/Core/DebugOff.hpp> #include <Nazara/Core/DebugOff.hpp>