Explorar o código

stl: drop version.hpp - some things do not fit custom implementations, that's all

skypjack hai 1 semana
pai
achega
5fa956395a

+ 0 - 1
CMakeLists.txt

@@ -216,7 +216,6 @@ if(ENTT_INCLUDE_HEADERS)
         stl/type_traits.hpp
         stl/utility.hpp
         stl/vector.hpp
-        stl/version.hpp
         tools/davey.hpp
         entt.hpp
         fwd.hpp

+ 1 - 1
src/entt/config/config.h

@@ -5,7 +5,7 @@
 #    include <entt/ext/config.h>
 #endif
 
-#include "../stl/version.hpp"
+#include <version>
 #include "version.h"
 
 // NOLINTBEGIN(cppcoreguidelines-macro-usage)

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

@@ -1,7 +1,7 @@
 #ifndef ENTT_CORE_RANGES_HPP
 #define ENTT_CORE_RANGES_HPP
 
-#include "../stl/version.hpp"
+#include <version>
 
 #if defined(__cpp_lib_ranges)
 #    include <ranges>

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

@@ -1,7 +1,7 @@
 #ifndef ENTT_ENTITY_RANGES_HPP
 #define ENTT_ENTITY_RANGES_HPP
 
-#include "../stl/version.hpp"
+#include <version>
 
 #if defined(__cpp_lib_ranges)
 #    include <ranges>

+ 0 - 1
src/entt/entt.hpp

@@ -90,5 +90,4 @@ namespace entt::stl {}
 #include "stl/type_traits.hpp"
 #include "stl/utility.hpp"
 #include "stl/vector.hpp"
-#include "stl/version.hpp"
 // IWYU pragma: end_exports

+ 1 - 1
src/entt/stl/iterator.hpp

@@ -2,8 +2,8 @@
 #define ENTT_STL_ITERATOR_HPP
 
 #include <iterator>
+#include <version>
 #include "../config/config.h"
-#include "version.hpp"
 
 /*! @cond ENTT_INTERNAL */
 namespace entt::stl {

+ 1 - 1
src/entt/stl/memory.hpp

@@ -2,8 +2,8 @@
 #define ENTT_STL_MEMORY_HPP
 
 #include <memory>
+#include <version>
 #include "../config/config.h"
-#include "version.hpp"
 
 /*! @cond ENTT_INTERNAL */
 namespace entt::stl {

+ 0 - 8
src/entt/stl/version.hpp

@@ -1,8 +0,0 @@
-#ifndef ENTT_STL_VERSION_HPP
-#define ENTT_STL_VERSION_HPP
-
-#if __has_include(<version>)
-#    include <version>
-#endif
-
-#endif