config: drop attribute.h, merge it with config.h

CMakeLists.txt

@@ -116,7 +116,6 @@ 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

src/entt/config/attribute.h

@@ -1,30 +0,0 @@
-#ifndef ENTT_CONFIG_ATTRIBUTE_H
-#define ENTT_CONFIG_ATTRIBUTE_H
-
-#ifndef ENTT_EXPORT
-#    if defined _WIN32 || defined __CYGWIN__ || defined _MSC_VER
-#        define ENTT_EXPORT __declspec(dllexport)
-#        define ENTT_IMPORT __declspec(dllimport)
-#        define ENTT_HIDDEN
-#    elif defined __GNUC__ && __GNUC__ >= 4
-#        define ENTT_EXPORT __attribute__((visibility("default")))
-#        define ENTT_IMPORT __attribute__((visibility("default")))
-#        define ENTT_HIDDEN __attribute__((visibility("hidden")))
-#    else /* Unsupported compiler */
-#        define ENTT_EXPORT
-#        define ENTT_IMPORT
-#        define ENTT_HIDDEN
-#    endif
-#endif
-
-#ifndef ENTT_API
-#    if defined ENTT_API_EXPORT
-#        define ENTT_API ENTT_EXPORT
-#    elif defined ENTT_API_IMPORT
-#        define ENTT_API ENTT_IMPORT
-#    else /* No API */
-#        define ENTT_API
-#    endif
-#endif
-
-#endif

src/entt/config/config.h

@@ -95,6 +95,32 @@
 #    endif
 #endif
 
+#ifndef ENTT_EXPORT
+#    if defined _WIN32 || defined __CYGWIN__ || defined _MSC_VER
+#        define ENTT_EXPORT __declspec(dllexport)
+#        define ENTT_IMPORT __declspec(dllimport)
+#        define ENTT_HIDDEN
+#    elif defined __GNUC__ && __GNUC__ >= 4
+#        define ENTT_EXPORT __attribute__((visibility("default")))
+#        define ENTT_IMPORT __attribute__((visibility("default")))
+#        define ENTT_HIDDEN __attribute__((visibility("hidden")))
+#    else /* Unsupported compiler */
+#        define ENTT_EXPORT
+#        define ENTT_IMPORT
+#        define ENTT_HIDDEN
+#    endif
+#endif
+
+#ifndef ENTT_API
+#    if defined ENTT_API_EXPORT
+#        define ENTT_API ENTT_EXPORT
+#    elif defined ENTT_API_IMPORT
+#        define ENTT_API ENTT_IMPORT
+#    else /* No API */
+#        define ENTT_API
+#    endif
+#endif
+
 #if defined _MSC_VER
 #    pragma detect_mismatch("entt.version", ENTT_VERSION)
 #    pragma detect_mismatch("entt.noexcept", ENTT_XSTR(ENTT_TRY))

src/entt/core/type_info.hpp

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

src/entt/entt.hpp

@@ -2,7 +2,6 @@
 namespace entt {}
 
 // IWYU pragma: begin_exports
-#include "config/attribute.h"
 #include "config/config.h"
 #include "config/macro.h"
 #include "config/version.h"

test/lib/dispatcher/shared/lib.cpp

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

test/lib/dispatcher/shared/main.cpp

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

test/lib/emitter/shared/lib.cpp

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

test/lib/emitter/shared/main.cpp

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

test/lib/locator/shared/lib.cpp

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

test/lib/locator/shared/main.cpp

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

test/lib/meta/shared/lib.cpp

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

test/lib/meta/shared/main.cpp

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

test/lib/registry/shared/lib.cpp

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

test/lib/registry/shared/main.cpp

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

test/lib/view/shared/lib.cpp

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

test/lib/view/shared/main.cpp

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