Browse Source

registry/storage/sparse_set: minor changes to get around an issue of gcc7.5

Michele Caini 4 years ago
parent
commit
daa4056f45
3 changed files with 4 additions and 4 deletions
  1. 2 2
      src/entt/entity/registry.hpp
  2. 1 1
      src/entt/entity/sparse_set.hpp
  3. 1 1
      src/entt/entity/storage.hpp

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

@@ -111,7 +111,7 @@ public:
     }
     }
 
 
     template<typename ILhs, typename IRhs>
     template<typename ILhs, typename IRhs>
-    friend auto operator-(const storage_proxy_iterator<ILhs> &, const storage_proxy_iterator<IRhs> &) ENTT_NOEXCEPT;
+    friend std::ptrdiff_t operator-(const storage_proxy_iterator<ILhs> &, const storage_proxy_iterator<IRhs> &) ENTT_NOEXCEPT;
 
 
     template<typename ILhs, typename IRhs>
     template<typename ILhs, typename IRhs>
     friend bool operator==(const storage_proxy_iterator<ILhs> &, const storage_proxy_iterator<IRhs> &) ENTT_NOEXCEPT;
     friend bool operator==(const storage_proxy_iterator<ILhs> &, const storage_proxy_iterator<IRhs> &) ENTT_NOEXCEPT;
@@ -124,7 +124,7 @@ private:
 };
 };
 
 
 template<typename ILhs, typename IRhs>
 template<typename ILhs, typename IRhs>
-[[nodiscard]] auto operator-(const storage_proxy_iterator<ILhs> &lhs, const storage_proxy_iterator<IRhs> &rhs) ENTT_NOEXCEPT {
+[[nodiscard]] std::ptrdiff_t operator-(const storage_proxy_iterator<ILhs> &lhs, const storage_proxy_iterator<IRhs> &rhs) ENTT_NOEXCEPT {
     return lhs.it - rhs.it;
     return lhs.it - rhs.it;
 }
 }
 
 

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

@@ -96,7 +96,7 @@ private:
 };
 };
 
 
 template<typename Type, typename Other>
 template<typename Type, typename Other>
-[[nodiscard]] auto operator-(const sparse_set_iterator<Type> &lhs, const sparse_set_iterator<Other> &rhs) ENTT_NOEXCEPT {
+[[nodiscard]] std::ptrdiff_t operator-(const sparse_set_iterator<Type> &lhs, const sparse_set_iterator<Other> &rhs) ENTT_NOEXCEPT {
     return rhs.index() - lhs.index();
     return rhs.index() - lhs.index();
 }
 }
 
 

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

@@ -122,7 +122,7 @@ private:
 };
 };
 
 
 template<typename CLhs, typename CRhs>
 template<typename CLhs, typename CRhs>
-[[nodiscard]] auto operator-(const storage_iterator<CLhs> &lhs, const storage_iterator<CRhs> &rhs) ENTT_NOEXCEPT {
+[[nodiscard]] std::ptrdiff_t operator-(const storage_iterator<CLhs> &lhs, const storage_iterator<CRhs> &rhs) ENTT_NOEXCEPT {
     return rhs.index() - lhs.index();
     return rhs.index() - lhs.index();
 }
 }