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

Merge remote-tracking branch 'origin/master' into Font-Update

Browse Source 
Former-commit-id: c62f6317f401e200eff303fcf5b8945302fd89c6
This commit is contained in:
Lynix
2015-01-03 22:21:14 +01:00
parent 5b0d65c767 a1624af969
commit 4e9bec804a
12 changed files with 372 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@
///FIXME: Est-ce que SparsePtr est vraiment le meilleur nom pour cette classe ?
#include <Nazara/Prerequesites.hpp>
#include <cstddef>
#include <type_traits>
template<typename T>
@@ -46,6 +47,7 @@ class NzSparsePtr
NzSparsePtr operator+(int count) const;
NzSparsePtr operator-(int count) const;
std::ptrdiff_t operator-(const NzSparsePtr& ptr) const;
NzSparsePtr& operator+=(int count);
NzSparsePtr& operator-=(int count);

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

@@ -133,6 +133,12 @@ NzSparsePtr<T> NzSparsePtr<T>::operator-(int count) const
return NzSparsePtr(m_ptr - count*m_stride, m_stride);
}
template<typename T>
std::ptrdiff_t NzSparsePtr<T>::operator-(const NzSparsePtr& ptr) const
{
return (m_ptr - ptr.m_ptr)/m_stride;
}
template<typename T>
NzSparsePtr<T>& NzSparsePtr<T>::operator+=(int count)
{