Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'iterator_increment' into 'master'

Browse Source 
Iterator increment



See merge request !35
This commit is contained in:
Jan Möbius
2015-12-15 08:09:56 +01:00
parent 257299defb df2ac9e79a
commit 74f0f23661
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenMesh/Core/Mesh/Handles.hh
View File

@@ -98,6 +98,8 @@ public:
void __increment() { ++idx_; }
void __decrement() { --idx_; }
void __increment(int amount) { idx_ += amount; }
void __decrement(int amount) { idx_ += amount; }
private:

31
src/OpenMesh/Core/Mesh/IteratorsT.hh
View File

@@ -170,6 +170,37 @@ class GenericIteratorT {
return cpy;
}
#if (_MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY)
template<class T = value_handle>
auto operator+=(int amount) ->
typename std::enable_if<
sizeof(decltype(std::declval<T>().__increment(amount))) >= 0,
GenericIteratorT&>::type {
static_assert(std::is_same<T, value_handle>::value,
"Template parameter must not deviate from default.");
if (skip_bits_)
throw std::logic_error("Skipping iterators do not support "
"random access.");
hnd_.__increment(amount);
return *this;
}
template<class T = value_handle>
auto operator+(int rhs) ->
typename std::enable_if<
sizeof(decltype(std::declval<T>().__increment(rhs), void (), int {})) >= 0,
GenericIteratorT>::type {
static_assert(std::is_same<T, value_handle>::value,
"Template parameter must not deviate from default.");
if (skip_bits_)
throw std::logic_error("Skipping iterators do not support "
"random access.");
GenericIteratorT result = *this;
result.hnd_.__increment(rhs);
return result;
}
#endif
/// Standard pre-decrement operator
GenericIteratorT& operator--() {
hnd_.__decrement();