Michele Caini 6 лет назад
Родитель
Сommit
97f4414cc4
4 измененных файлов с 10 добавлено и 10 удалено
  1. 2 2
      src/entt/entity/runtime_view.hpp
  2. 2 2
      src/entt/entity/sparse_set.hpp
  3. 4 4
      src/entt/entity/storage.hpp
  4. 2 2
      src/entt/entity/view.hpp

+ 2 - 2
src/entt/entity/runtime_view.hpp

@@ -97,7 +97,7 @@ class basic_runtime_view {
 
 
         iterator operator++(int) {
         iterator operator++(int) {
             iterator orig = *this;
             iterator orig = *this;
-            return ++(*this), orig;
+            return operator++(), orig;
         }
         }
 
 
         iterator & operator--() ENTT_NOEXCEPT {
         iterator & operator--() ENTT_NOEXCEPT {
@@ -107,7 +107,7 @@ class basic_runtime_view {
 
 
         iterator operator--(int) ENTT_NOEXCEPT {
         iterator operator--(int) ENTT_NOEXCEPT {
             iterator orig = *this;
             iterator orig = *this;
-            return --(*this), orig;
+            return operator--(), orig;
         }
         }
 
 
         bool operator==(const iterator &other) const ENTT_NOEXCEPT {
         bool operator==(const iterator &other) const ENTT_NOEXCEPT {

+ 2 - 2
src/entt/entity/sparse_set.hpp

@@ -77,7 +77,7 @@ class sparse_set {
 
 
         iterator operator++(int) ENTT_NOEXCEPT {
         iterator operator++(int) ENTT_NOEXCEPT {
             iterator orig = *this;
             iterator orig = *this;
-            return ++(*this), orig;
+            return operator++(), orig;
         }
         }
 
 
         iterator & operator--() ENTT_NOEXCEPT {
         iterator & operator--() ENTT_NOEXCEPT {
@@ -86,7 +86,7 @@ class sparse_set {
 
 
         iterator operator--(int) ENTT_NOEXCEPT {
         iterator operator--(int) ENTT_NOEXCEPT {
             iterator orig = *this;
             iterator orig = *this;
-            return --(*this), orig;
+            return operator--(), orig;
         }
         }
 
 
         iterator & operator+=(const difference_type value) ENTT_NOEXCEPT {
         iterator & operator+=(const difference_type value) ENTT_NOEXCEPT {

+ 4 - 4
src/entt/entity/storage.hpp

@@ -77,7 +77,7 @@ class storage: public sparse_set<Entity> {
 
 
         iterator operator++(int) ENTT_NOEXCEPT {
         iterator operator++(int) ENTT_NOEXCEPT {
             iterator orig = *this;
             iterator orig = *this;
-            return ++(*this), orig;
+            return operator++(), orig;
         }
         }
 
 
         iterator & operator--() ENTT_NOEXCEPT {
         iterator & operator--() ENTT_NOEXCEPT {
@@ -86,7 +86,7 @@ class storage: public sparse_set<Entity> {
 
 
         iterator operator--(int) ENTT_NOEXCEPT {
         iterator operator--(int) ENTT_NOEXCEPT {
             iterator orig = *this;
             iterator orig = *this;
-            return --(*this), orig;
+            return operator--(), orig;
         }
         }
 
 
         iterator & operator+=(const difference_type value) ENTT_NOEXCEPT {
         iterator & operator+=(const difference_type value) ENTT_NOEXCEPT {
@@ -513,7 +513,7 @@ class storage<Entity, Type, std::enable_if_t<ENTT_ENABLE_ETO(Type)>>: public spa
 
 
         iterator operator++(int) ENTT_NOEXCEPT {
         iterator operator++(int) ENTT_NOEXCEPT {
             iterator orig = *this;
             iterator orig = *this;
-            return ++(*this), orig;
+            return operator++(), orig;
         }
         }
 
 
         iterator & operator--() ENTT_NOEXCEPT {
         iterator & operator--() ENTT_NOEXCEPT {
@@ -522,7 +522,7 @@ class storage<Entity, Type, std::enable_if_t<ENTT_ENABLE_ETO(Type)>>: public spa
 
 
         iterator operator--(int) ENTT_NOEXCEPT {
         iterator operator--(int) ENTT_NOEXCEPT {
             iterator orig = *this;
             iterator orig = *this;
-            return --(*this), orig;
+            return operator--(), orig;
         }
         }
 
 
         iterator & operator+=(const difference_type value) ENTT_NOEXCEPT {
         iterator & operator+=(const difference_type value) ENTT_NOEXCEPT {

+ 2 - 2
src/entt/entity/view.hpp

@@ -114,7 +114,7 @@ class basic_view<Entity, exclude_t<Exclude...>, Component...> {
 
 
         iterator operator++(int) {
         iterator operator++(int) {
             iterator orig = *this;
             iterator orig = *this;
-            return ++(*this), orig;
+            return operator++(), orig;
         }
         }
 
 
         iterator & operator--() ENTT_NOEXCEPT {
         iterator & operator--() ENTT_NOEXCEPT {
@@ -124,7 +124,7 @@ class basic_view<Entity, exclude_t<Exclude...>, Component...> {
 
 
         iterator operator--(int) ENTT_NOEXCEPT {
         iterator operator--(int) ENTT_NOEXCEPT {
             iterator orig = *this;
             iterator orig = *this;
-            return --(*this), orig;
+            return operator--(), orig;
         }
         }
 
 
         bool operator==(const iterator &other) const ENTT_NOEXCEPT {
         bool operator==(const iterator &other) const ENTT_NOEXCEPT {