Ver Fonte

stl: cannot specialize variables across namespaces

skypjack há 1 semana atrás
pai
commit
4c47abaca7
3 ficheiros alterados com 10 adições e 8 exclusões
  1. 2 2
      src/entt/core/ranges.hpp
  2. 4 4
      src/entt/entity/ranges.hpp
  3. 4 2
      src/entt/stl/ranges.hpp

+ 2 - 2
src/entt/core/ranges.hpp

@@ -8,10 +8,10 @@
 #    include "iterator.hpp"
 
 template<class... Args>
-inline constexpr bool entt::stl::ranges::enable_borrowed_range<entt::iterable_adaptor<Args...>>{true};
+inline constexpr bool ENTT_STL_RANGES::enable_borrowed_range<entt::iterable_adaptor<Args...>>{true};
 
 template<class... Args>
-inline constexpr bool entt::stl::ranges::enable_view<entt::iterable_adaptor<Args...>>{true};
+inline constexpr bool ENTT_STL_RANGES::enable_view<entt::iterable_adaptor<Args...>>{true};
 
 #endif
 

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

@@ -8,16 +8,16 @@
 #    include "fwd.hpp"
 
 template<class... Args>
-inline constexpr bool entt::stl::ranges::enable_borrowed_range<entt::basic_view<Args...>>{true};
+inline constexpr bool ENTT_STL_RANGES::enable_borrowed_range<entt::basic_view<Args...>>{true};
 
 template<class... Args>
-inline constexpr bool entt::stl::ranges::enable_borrowed_range<entt::basic_group<Args...>>{true};
+inline constexpr bool ENTT_STL_RANGES::enable_borrowed_range<entt::basic_group<Args...>>{true};
 
 template<class... Args>
-inline constexpr bool entt::stl::ranges::enable_view<entt::basic_view<Args...>>{true};
+inline constexpr bool ENTT_STL_RANGES::enable_view<entt::basic_view<Args...>>{true};
 
 template<class... Args>
-inline constexpr bool entt::stl::ranges::enable_view<entt::basic_group<Args...>>{true};
+inline constexpr bool ENTT_STL_RANGES::enable_view<entt::basic_group<Args...>>{true};
 
 #endif
 

+ 4 - 2
src/entt/stl/ranges.hpp

@@ -9,10 +9,12 @@
 /*! @cond ENTT_INTERNAL */
 namespace entt::stl::ranges {
 
-using std::ranges::enable_borrowed_range;
-using std::ranges::enable_view;
+// nothing to import (yet)
 
 } // namespace entt::stl::ranges
+
+#    define ENTT_STL_RANGES std::ranges
+
 /*! @endcond */
 
 #endif