diff --git a/CMakeLists.txt b/CMakeLists.txt index 014aa9c18..1e966a7cd 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/src/entt/core/attribute.h b/src/entt/config/attribute.h similarity index 92% rename from src/entt/core/attribute.h rename to src/entt/config/attribute.h index b1d0503be..84c5ee422 100644 --- a/src/entt/core/attribute.h +++ b/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 diff --git a/src/entt/core/type_info.hpp b/src/entt/core/type_info.hpp index d4436af97..372a8a0f6 100644 --- a/src/entt/core/type_info.hpp +++ b/src/entt/core/type_info.hpp @@ -4,8 +4,8 @@ #include #include #include +#include "../config/attribute.h" #include "../config/config.h" -#include "attribute.h" #include "fwd.hpp" #include "hashed_string.hpp" diff --git a/src/entt/entt.hpp b/src/entt/entt.hpp index 43186e201..56b85847d 100644 --- a/src/entt/entt.hpp +++ b/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" diff --git a/src/entt/meta/node.hpp b/src/entt/meta/node.hpp index fb1221065..1be7b860f 100644 --- a/src/entt/meta/node.hpp +++ b/src/entt/meta/node.hpp @@ -8,7 +8,6 @@ #include #include #include "../config/config.h" -#include "../core/attribute.h" #include "../core/bit.hpp" #include "../core/enum.hpp" #include "../core/fwd.hpp" diff --git a/test/lib/dispatcher/shared/lib.cpp b/test/lib/dispatcher/shared/lib.cpp index b1a81b72f..422273a0c 100644 --- a/test/lib/dispatcher/shared/lib.cpp +++ b/test/lib/dispatcher/shared/lib.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "../../../common/boxed_type.h" #include "../../../common/empty.h" diff --git a/test/lib/dispatcher/shared/main.cpp b/test/lib/dispatcher/shared/main.cpp index 8b5c70a71..5e99611e2 100644 --- a/test/lib/dispatcher/shared/main.cpp +++ b/test/lib/dispatcher/shared/main.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/test/lib/emitter/shared/lib.cpp b/test/lib/emitter/shared/lib.cpp index 5a5e19adc..82168dced 100644 --- a/test/lib/emitter/shared/lib.cpp +++ b/test/lib/emitter/shared/lib.cpp @@ -1,4 +1,4 @@ -#include +#include #include "../../../common/boxed_type.h" #include "../../../common/emitter.h" #include "../../../common/empty.h" diff --git a/test/lib/emitter/shared/main.cpp b/test/lib/emitter/shared/main.cpp index 8f77c70f4..2aac32006 100644 --- a/test/lib/emitter/shared/main.cpp +++ b/test/lib/emitter/shared/main.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include "../../../common/boxed_type.h" #include "../../../common/emitter.h" diff --git a/test/lib/locator/shared/lib.cpp b/test/lib/locator/shared/lib.cpp index 51230c839..8b89b6313 100644 --- a/test/lib/locator/shared/lib.cpp +++ b/test/lib/locator/shared/lib.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "../../../common/boxed_type.h" diff --git a/test/lib/locator/shared/main.cpp b/test/lib/locator/shared/main.cpp index f74fa6a82..f10b6aa92 100644 --- a/test/lib/locator/shared/main.cpp +++ b/test/lib/locator/shared/main.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include "../../../common/boxed_type.h" diff --git a/test/lib/meta/shared/lib.cpp b/test/lib/meta/shared/lib.cpp index be9dc6790..eedfa12e1 100644 --- a/test/lib/meta/shared/lib.cpp +++ b/test/lib/meta/shared/lib.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/test/lib/meta/shared/main.cpp b/test/lib/meta/shared/main.cpp index de50c845f..99cd5abba 100644 --- a/test/lib/meta/shared/main.cpp +++ b/test/lib/meta/shared/main.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/test/lib/registry/shared/lib.cpp b/test/lib/registry/shared/lib.cpp index dc93044d1..e55413e8a 100644 --- a/test/lib/registry/shared/lib.cpp +++ b/test/lib/registry/shared/lib.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/test/lib/registry/shared/main.cpp b/test/lib/registry/shared/main.cpp index 7fe577a43..dd178a64a 100644 --- a/test/lib/registry/shared/main.cpp +++ b/test/lib/registry/shared/main.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/test/lib/view/shared/lib.cpp b/test/lib/view/shared/lib.cpp index 13c6bc2f3..b6ca82256 100644 --- a/test/lib/view/shared/lib.cpp +++ b/test/lib/view/shared/lib.cpp @@ -1,4 +1,4 @@ -#include +#include #include "../types.h" ENTT_API const void *filter(const view_type &view) { diff --git a/test/lib/view/shared/main.cpp b/test/lib/view/shared/main.cpp index 401e46d46..ba97a4e76 100644 --- a/test/lib/view/shared/main.cpp +++ b/test/lib/view/shared/main.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include "../types.h" ENTT_API const void *filter(const view_type &);