diff options
author | Julian Eisel <julian@blender.org> | 2022-07-28 21:43:51 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2022-07-28 21:45:28 +0300 |
commit | d094a3722c9c00a3d32a66f1f0fffa12619630a8 (patch) | |
tree | f3b14d078281a0392876e0af4bf3b7986da94f4e | |
parent | 9c65af2df0bfb50ec6369b2344d9b9e691397f0d (diff) |
Fix wrong post-increment operators & test for BLI containers
-rw-r--r-- | source/blender/blenlib/BLI_index_range.hh | 4 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_listbase_wrapper.hh | 2 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_map.hh | 4 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_set.hh | 4 | ||||
-rw-r--r-- | source/blender/blenlib/tests/BLI_set_test.cc | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenlib/BLI_index_range.hh b/source/blender/blenlib/BLI_index_range.hh index 6fcc560d856..2b290e1ba7d 100644 --- a/source/blender/blenlib/BLI_index_range.hh +++ b/source/blender/blenlib/BLI_index_range.hh @@ -90,10 +90,10 @@ class IndexRange { return *this; } - constexpr Iterator operator++(int) const + constexpr Iterator operator++(int) { Iterator copied_iterator = *this; - ++copied_iterator; + ++(*this); return copied_iterator; } diff --git a/source/blender/blenlib/BLI_listbase_wrapper.hh b/source/blender/blenlib/BLI_listbase_wrapper.hh index 25e029a5616..2d631cb2441 100644 --- a/source/blender/blenlib/BLI_listbase_wrapper.hh +++ b/source/blender/blenlib/BLI_listbase_wrapper.hh @@ -50,7 +50,7 @@ template<typename T> class ListBaseWrapper { Iterator operator++(int) { Iterator iterator = *this; - ++*this; + ++(*this); return iterator; } diff --git a/source/blender/blenlib/BLI_map.hh b/source/blender/blenlib/BLI_map.hh index 55233676ed8..95d1e344894 100644 --- a/source/blender/blenlib/BLI_map.hh +++ b/source/blender/blenlib/BLI_map.hh @@ -669,10 +669,10 @@ class Map { return *this; } - BaseIterator operator++(int) const + BaseIterator operator++(int) { BaseIterator copied_iterator = *this; - ++copied_iterator; + ++(*this); return copied_iterator; } diff --git a/source/blender/blenlib/BLI_set.hh b/source/blender/blenlib/BLI_set.hh index 62de4b79e41..a1b6ad9754e 100644 --- a/source/blender/blenlib/BLI_set.hh +++ b/source/blender/blenlib/BLI_set.hh @@ -427,10 +427,10 @@ class Set { return *this; } - Iterator operator++(int) const + Iterator operator++(int) { Iterator copied_iterator = *this; - ++copied_iterator; + ++(*this); return copied_iterator; } diff --git a/source/blender/blenlib/tests/BLI_set_test.cc b/source/blender/blenlib/tests/BLI_set_test.cc index 5a97b2c7999..42a0d229b77 100644 --- a/source/blender/blenlib/tests/BLI_set_test.cc +++ b/source/blender/blenlib/tests/BLI_set_test.cc @@ -532,8 +532,8 @@ TEST(set, ForwardIterator) Set<int>::iterator iter1 = set.begin(); int value1 = *iter1; Set<int>::iterator iter2 = iter1++; - EXPECT_EQ(*iter1, value1); - EXPECT_EQ(*iter2, *(++iter1)); + EXPECT_EQ(*iter1, *(++iter1)); + EXPECT_EQ(*iter2, value1); } TEST(set, GenericAlgorithms) |