Sfoglia il codice sorgente

*: move attribute.h to config

skypjack 4 mesi fa
parent
commit
5df7142f51

+ 1 - 1
CMakeLists.txt

@@ -116,6 +116,7 @@ option(ENTT_INCLUDE_NATVIS "Add EnTT natvis files to the EnTT target." OFF)
 if(ENTT_INCLUDE_HEADERS)
     set(
         HEADERS_FILES
+        config/attribute.h
         config/config.h
         config/macro.h
         config/version.h
@@ -125,7 +126,6 @@ if(ENTT_INCLUDE_HEADERS)
         container/fwd.hpp
         core/algorithm.hpp
         core/any.hpp
-        core/attribute.h
         core/bit.hpp
         core/compressed_pair.hpp
         core/enum.hpp

+ 2 - 2
src/entt/core/attribute.h → src/entt/config/attribute.h

@@ -1,5 +1,5 @@
-#ifndef ENTT_CORE_ATTRIBUTE_H
-#define ENTT_CORE_ATTRIBUTE_H
+#ifndef ENTT_CONFIG_ATTRIBUTE_H
+#define ENTT_CONFIG_ATTRIBUTE_H
 
 #ifndef ENTT_EXPORT
 #    if defined _WIN32 || defined __CYGWIN__ || defined _MSC_VER

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

@@ -4,8 +4,8 @@
 #include <string_view>
 #include <type_traits>
 #include <utility>
+#include "../config/attribute.h"
 #include "../config/config.h"
-#include "attribute.h"
 #include "fwd.hpp"
 #include "hashed_string.hpp"
 

+ 1 - 1
src/entt/entt.hpp

@@ -2,6 +2,7 @@
 namespace entt {}
 
 // IWYU pragma: begin_exports
+#include "config/attribute.h"
 #include "config/config.h"
 #include "config/macro.h"
 #include "config/version.h"
@@ -10,7 +11,6 @@ namespace entt {}
 #include "container/table.hpp"
 #include "core/algorithm.hpp"
 #include "core/any.hpp"
-#include "core/attribute.h"
 #include "core/bit.hpp"
 #include "core/compressed_pair.hpp"
 #include "core/enum.hpp"

+ 0 - 1
src/entt/meta/node.hpp

@@ -8,7 +8,6 @@
 #include <utility>
 #include <vector>
 #include "../config/config.h"
-#include "../core/attribute.h"
 #include "../core/bit.hpp"
 #include "../core/enum.hpp"
 #include "../core/fwd.hpp"

+ 1 - 1
test/lib/dispatcher/shared/lib.cpp

@@ -1,4 +1,4 @@
-#include <entt/core/attribute.h>
+#include <entt/config/attribute.h>
 #include <entt/signal/dispatcher.hpp>
 #include "../../../common/boxed_type.h"
 #include "../../../common/empty.h"

+ 1 - 1
test/lib/dispatcher/shared/main.cpp

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <entt/core/attribute.h>
+#include <entt/config/attribute.h>
 #include <entt/core/utility.hpp>
 #include <entt/signal/dispatcher.hpp>
 #include <entt/signal/sigh.hpp>

+ 1 - 1
test/lib/emitter/shared/lib.cpp

@@ -1,4 +1,4 @@
-#include <entt/core/attribute.h>
+#include <entt/config/attribute.h>
 #include "../../../common/boxed_type.h"
 #include "../../../common/emitter.h"
 #include "../../../common/empty.h"

+ 1 - 1
test/lib/emitter/shared/main.cpp

@@ -1,6 +1,6 @@
 #include <functional>
 #include <gtest/gtest.h>
-#include <entt/core/attribute.h>
+#include <entt/config/attribute.h>
 #include "../../../common/boxed_type.h"
 #include "../../../common/emitter.h"
 

+ 1 - 1
test/lib/locator/shared/lib.cpp

@@ -1,4 +1,4 @@
-#include <entt/core/attribute.h>
+#include <entt/config/attribute.h>
 #include <entt/locator/locator.hpp>
 #include "../../../common/boxed_type.h"
 

+ 1 - 1
test/lib/locator/shared/main.cpp

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <entt/core/attribute.h>
+#include <entt/config/attribute.h>
 #include <entt/locator/locator.hpp>
 #include "../../../common/boxed_type.h"
 

+ 1 - 1
test/lib/meta/shared/lib.cpp

@@ -1,4 +1,4 @@
-#include <entt/core/attribute.h>
+#include <entt/config/attribute.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/locator/locator.hpp>
 #include <entt/meta/context.hpp>

+ 1 - 1
test/lib/meta/shared/main.cpp

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <entt/core/attribute.h>
+#include <entt/config/attribute.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/locator/locator.hpp>
 #include <entt/meta/context.hpp>

+ 1 - 1
test/lib/registry/shared/lib.cpp

@@ -1,4 +1,4 @@
-#include <entt/core/attribute.h>
+#include <entt/config/attribute.h>
 #include <entt/entity/mixin.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/view.hpp>

+ 1 - 1
test/lib/registry/shared/main.cpp

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <entt/core/attribute.h>
+#include <entt/config/attribute.h>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/mixin.hpp>
 #include <entt/entity/registry.hpp>

+ 1 - 1
test/lib/view/shared/lib.cpp

@@ -1,4 +1,4 @@
-#include <entt/core/attribute.h>
+#include <entt/config/attribute.h>
 #include "../types.h"
 
 ENTT_API const void *filter(const view_type &view) {

+ 1 - 1
test/lib/view/shared/main.cpp

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <entt/core/attribute.h>
+#include <entt/config/attribute.h>
 #include "../types.h"
 
 ENTT_API const void *filter(const view_type &);