test/common/aggregate.h

@@ -1,26 +0,0 @@
-#ifndef ENTT_COMMON_AGGREGATE_H
-#define ENTT_COMMON_AGGREGATE_H
-
-#include <compare>
-#include <type_traits>
-
-namespace test {
-
-struct aggregate {
-    int value{};
-
-    [[nodiscard]] constexpr bool operator==(const aggregate &other) const noexcept {
-        return value == other.value;
-    }
-
-    [[nodiscard]] constexpr auto operator<=>(const aggregate &other) const noexcept {
-        return value <=> other.value;
-    }
-};
-
-// ensure aggregate-ness :)
-static_assert(std::is_aggregate_v<test::aggregate>, "Not an aggregate type");
-
-} // namespace test
-
-#endif

test/common/boxed_type.h

@@ -1,24 +0,0 @@
-#ifndef ENTT_COMMON_BOXED_TYPE_H
-#define ENTT_COMMON_BOXED_TYPE_H
-
-namespace test {
-
-template<typename Type>
-struct boxed_type {
-    Type value{};
-
-    operator Type() const noexcept {
-        return value;
-    }
-
-    [[nodiscard]] bool operator==(const boxed_type &other) const noexcept {
-        return value == other.value;
-    }
-};
-
-using boxed_int = boxed_type<int>;
-using boxed_char = boxed_type<char>;
-
-} // namespace test
-
-#endif

test/common/empty.h

@@ -1,11 +0,0 @@
-#ifndef ENTT_COMMON_EMPTY_H
-#define ENTT_COMMON_EMPTY_H
-
-namespace test {
-
-struct empty {};
-struct other_empty {};
-
-} // namespace test
-
-#endif

test/common/value_type.h

@@ -45,29 +45,49 @@ struct non_movable_mixin: Type {
     non_movable_mixin &operator=(const non_movable_mixin &) noexcept = default;
 };
 
-struct empty_mixin {};
+struct empty_type {};
 
+struct aggregate_type {
+    [[nodiscard]] constexpr bool operator==(const aggregate_type &) const noexcept = default;
+    [[nodiscard]] constexpr auto operator<=>(const aggregate_type &) const noexcept = default;
+    int value{};
+};
+
+template<typename Type>
 struct value_type {
     constexpr value_type() = default;
-    constexpr value_type(int elem): value{elem} {}
+    constexpr value_type(Type elem): value{elem} {}
     [[nodiscard]] constexpr bool operator==(const value_type &) const noexcept = default;
     [[nodiscard]] constexpr auto operator<=>(const value_type &) const noexcept = default;
-    int value{};
+    operator Type() const noexcept {
+        return value;
+    }
+    Type value{};
 };
 
 } // namespace internal
 
-using pointer_stable = internal::pointer_stable_mixin<internal::value_type>;
-using non_default_constructible = internal::non_default_constructible_mixin<internal::value_type>;
-using non_trivially_destructible = internal::non_trivially_destructible_mixin<internal::value_type>;
-using pointer_stable_non_trivially_destructible = internal::pointer_stable_mixin<internal::non_trivially_destructible_mixin<internal::value_type>>;
-using non_comparable = internal::non_comparable_mixin<internal::empty_mixin>;
-using non_movable = internal::non_movable_mixin<internal::value_type>;
-
-static_assert(std::is_trivially_destructible_v<test::pointer_stable>, "Not a trivially destructible type");
-static_assert(!std::is_trivially_destructible_v<test::non_trivially_destructible>, "Trivially destructible type");
-static_assert(!std::is_trivially_destructible_v<test::pointer_stable_non_trivially_destructible>, "Trivially destructible type");
-static_assert(!std::is_move_constructible_v<test::non_movable> && !std::is_move_assignable_v<test::non_movable>, "Movable type");
+using pointer_stable = internal::pointer_stable_mixin<internal::value_type<int>>;
+using pointer_stable_non_trivially_destructible = internal::pointer_stable_mixin<internal::non_trivially_destructible_mixin<internal::value_type<int>>>;
+
+using non_default_constructible = internal::non_default_constructible_mixin<internal::value_type<int>>;
+using non_trivially_destructible = internal::non_trivially_destructible_mixin<internal::value_type<int>>;
+using non_comparable = internal::non_comparable_mixin<internal::empty_type>;
+using non_movable = internal::non_movable_mixin<internal::value_type<int>>;
+
+using boxed_int = internal::value_type<int>;
+using boxed_char = internal::value_type<char>;
+
+using empty = internal::empty_type;
+struct other_empty: internal::empty_type {};
+
+using aggregate = internal::aggregate_type;
+
+static_assert(std::is_trivially_destructible_v<pointer_stable>, "Not a trivially destructible type");
+static_assert(!std::is_trivially_destructible_v<non_trivially_destructible>, "Trivially destructible type");
+static_assert(!std::is_trivially_destructible_v<pointer_stable_non_trivially_destructible>, "Trivially destructible type");
+static_assert(!std::is_move_constructible_v<non_movable> && !std::is_move_assignable_v<non_movable>, "Movable type");
+static_assert(std::is_aggregate_v<aggregate>, "Not an aggregate type");
 
 } // namespace test
 

test/entt/core/algorithm.cpp

@@ -3,7 +3,7 @@
 #include <vector>
 #include <gtest/gtest.h>
 #include <entt/core/algorithm.hpp>
-#include "../../common/boxed_type.h"
+#include "../../common/value_type.h"
 
 TEST(Algorithm, StdSort) {
     // well, I'm pretty sure it works, it's std::sort!!

test/entt/core/any.cpp

@@ -9,7 +9,6 @@
 #include <gtest/gtest.h>
 #include <entt/core/any.hpp>
 #include <entt/core/type_info.hpp>
-#include "../../common/aggregate.h"
 #include "../../common/config.h"
 #include "../../common/linter.hpp"
 #include "../../common/new_delete.h"

test/entt/core/compressed_pair.cpp

@@ -6,7 +6,6 @@
 #include <vector>
 #include <gtest/gtest.h>
 #include <entt/core/compressed_pair.hpp>
-#include "../../common/empty.h"
 #include "../../common/value_type.h"
 
 TEST(CompressedPair, Size) {

test/entt/core/ident.cpp

@@ -1,8 +1,7 @@
 #include <type_traits>
 #include <gtest/gtest.h>
 #include <entt/core/ident.hpp>
-#include "../../common/boxed_type.h"
-#include "../../common/empty.h"
+#include "../../common/value_type.h"
 
 TEST(Ident, Uniqueness) {
     using id = entt::ident<test::empty, test::boxed_int>;

test/entt/core/iterator.cpp

@@ -3,7 +3,7 @@
 #include <vector>
 #include <gtest/gtest.h>
 #include <entt/core/iterator.hpp>
-#include "../../common/boxed_type.h"
+#include "../../common/value_type.h"
 
 TEST(Iterator, InputIteratorPointer) {
     entt::input_iterator_pointer ptr{test::boxed_int{0}};

test/entt/entity/component.cpp

@@ -2,8 +2,6 @@
 #include <gtest/gtest.h>
 #include <entt/config/config.h>
 #include <entt/entity/component.hpp>
-#include "../../common/boxed_type.h"
-#include "../../common/empty.h"
 #include "../../common/value_type.h"
 
 struct ComponentBase: testing::Test {

test/entt/entity/group.cpp

@@ -11,9 +11,8 @@
 #include <entt/entity/registry.hpp>
 #include <entt/entity/view.hpp>
 #include <entt/signal/sigh.hpp>
-#include "../../common/boxed_type.h"
 #include "../../common/config.h"
-#include "../../common/empty.h"
+#include "../../common/value_type.h"
 
 TEST(GroupNonOwning, Functionalities) {
     entt::registry registry;

test/entt/entity/reactive_mixin.cpp

@@ -13,10 +13,10 @@
 #include <entt/entity/storage.hpp>
 #include <entt/signal/sigh.hpp>
 #include "../../common/config.h"
-#include "../../common/empty.h"
 #include "../../common/linter.hpp"
 #include "../../common/registry.h"
 #include "../../common/throwing_allocator.hpp"
+#include "../../common/value_type.h"
 
 struct ReactiveMixinBase: testing::Test {
     enum class my_entity : std::uint32_t {};

test/entt/entity/registry.cpp

@@ -19,9 +19,7 @@
 #include <entt/entity/storage.hpp>
 #include <entt/entity/view.hpp>
 #include <entt/signal/sigh.hpp>
-#include "../../common/aggregate.h"
 #include "../../common/config.h"
-#include "../../common/empty.h"
 #include "../../common/mixin.hpp"
 #include "../../common/value_type.h"
 

test/entt/entity/snapshot.cpp

@@ -12,7 +12,6 @@
 #include <entt/entity/snapshot.hpp>
 #include <entt/signal/sigh.hpp>
 #include "../../common/config.h"
-#include "../../common/empty.h"
 #include "../../common/value_type.h"
 
 struct SnapshotCommonBase: testing::Test {

test/entt/entity/storage.cpp

@@ -12,7 +12,6 @@
 #include <entt/entity/component.hpp>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/storage.hpp>
-#include "../../common/aggregate.h"
 #include "../../common/config.h"
 #include "../../common/linter.hpp"
 #include "../../common/new_delete.h"

test/entt/entity/storage_no_instance.cpp

@@ -12,8 +12,8 @@
 #include <entt/entity/entity.hpp>
 #include <entt/entity/storage.hpp>
 #include "../../common/config.h"
-#include "../../common/empty.h"
 #include "../../common/linter.hpp"
+#include "../../common/value_type.h"
 
 template<typename Type>
 struct StorageNoInstance: testing::Test {

test/entt/entity/view.cpp

@@ -8,8 +8,6 @@
 #include <entt/entity/entity.hpp>
 #include <entt/entity/storage.hpp>
 #include <entt/entity/view.hpp>
-#include "../../common/boxed_type.h"
-#include "../../common/empty.h"
 #include "../../common/value_type.h"
 
 TEST(ViewSingleStorage, Functionalities) {

test/entt/meta/meta_container.cpp

@@ -14,7 +14,6 @@
 #include <entt/meta/meta.hpp>
 #include <entt/meta/resolve.hpp>
 #include "../../common/config.h"
-#include "../../common/empty.h"
 #include "../../common/value_type.h"
 
 TEST(MetaContainer, Invalid) {

test/entt/meta/meta_context.cpp

@@ -12,7 +12,7 @@
 #include <entt/meta/pointer.hpp>
 #include <entt/meta/resolve.hpp>
 #include <entt/meta/template.hpp>
-#include "../../common/empty.h"
+#include "../../common/value_type.h"
 
 class MetaContext: public ::testing::Test {
     static void init_global_context() {

test/entt/meta/meta_factory.cpp

@@ -9,9 +9,9 @@
 #include <entt/meta/meta.hpp>
 #include <entt/meta/range.hpp>
 #include <entt/meta/resolve.hpp>
-#include "../../common/boxed_type.h"
 #include "../../common/config.h"
 #include "../../common/meta_traits.h"
+#include "../../common/value_type.h"
 
 struct MetaFactory: ::testing::Test {
     struct base {

test/entt/meta/meta_utility.cpp

@@ -8,7 +8,7 @@
 #include <entt/meta/resolve.hpp>
 #include <entt/meta/utility.hpp>
 #include "../../common/config.h"
-#include "../../common/empty.h"
+#include "../../common/value_type.h"
 
 struct MetaUtility: ::testing::Test {
     struct clazz {

test/entt/process/process.cpp

@@ -2,7 +2,7 @@
 #include <memory>
 #include <gtest/gtest.h>
 #include <entt/process/process.hpp>
-#include "../../common/empty.h"
+#include "../../common/value_type.h"
 
 template<typename Delta>
 class test_process: public entt::basic_process<Delta> {

test/entt/resource/resource_cache.cpp

@@ -9,9 +9,9 @@
 #include <entt/resource/cache.hpp>
 #include <entt/resource/loader.hpp>
 #include <entt/resource/resource.hpp>
-#include "../../common/empty.h"
 #include "../../common/linter.hpp"
 #include "../../common/throwing_allocator.hpp"
+#include "../../common/value_type.h"
 
 template<typename Type>
 struct loader {

test/entt/signal/dispatcher.cpp

@@ -3,7 +3,7 @@
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/signal/dispatcher.hpp>
-#include "../../common/empty.h"
+#include "../../common/value_type.h"
 
 // makes the type non-aggregate
 struct non_aggregate {

test/entt/signal/emitter.cpp

@@ -3,10 +3,9 @@
 #include <utility>
 #include <gtest/gtest.h>
 #include <entt/signal/emitter.hpp>
-#include "../../common/boxed_type.h"
 #include "../../common/emitter.h"
-#include "../../common/empty.h"
 #include "../../common/linter.hpp"
+#include "../../common/value_type.h"
 
 TEST(Emitter, Move) {
     test::emitter emitter{};

test/lib/dispatcher/plugin/main.cpp

@@ -4,8 +4,8 @@
 #include <cr.h>
 #include <entt/signal/dispatcher.hpp>
 #include <entt/signal/sigh.hpp>
-#include "../../../common/boxed_type.h"
 #include "../../../common/listener.h"
+#include "../../../common/value_type.h"
 
 TEST(Dispatcher, Plugin) {
     entt::dispatcher dispatcher;

test/lib/dispatcher/plugin/plugin.cpp

@@ -1,7 +1,6 @@
 #include <cr.h>
 #include <entt/signal/dispatcher.hpp>
-#include "../../../common/boxed_type.h"
-#include "../../../common/empty.h"
+#include "../../../common/value_type.h"
 
 CR_EXPORT int cr_main(cr_plugin *ctx, cr_op operation) {
     switch(operation) {

test/lib/dispatcher/shared/lib.cpp

@@ -1,7 +1,6 @@
 #include <entt/config/config.h>
 #include <entt/signal/dispatcher.hpp>
-#include "../../../common/boxed_type.h"
-#include "../../../common/empty.h"
+#include "../../../common/value_type.h"
 #include "lib.h"
 
 ENTT_API void trigger(entt::dispatcher &dispatcher) {

test/lib/dispatcher/shared/main.cpp

@@ -3,8 +3,8 @@
 #include <entt/core/utility.hpp>
 #include <entt/signal/dispatcher.hpp>
 #include <entt/signal/sigh.hpp>
-#include "../../../common/boxed_type.h"
 #include "../../../common/listener.h"
+#include "../../../common/value_type.h"
 #include "lib.h"
 
 TEST(Dispatcher, Shared) {

test/lib/emitter/plugin/main.cpp

@@ -3,8 +3,8 @@
 #include <functional>
 #include <gtest/gtest.h>
 #include <cr.h>
-#include "../../../common/boxed_type.h"
 #include "../../../common/emitter.h"
+#include "../../../common/value_type.h"
 
 TEST(Emitter, Plugin) {
     test::emitter emitter;

test/lib/emitter/plugin/plugin.cpp

@@ -1,7 +1,6 @@
 #include <cr.h>
-#include "../../../common/boxed_type.h"
 #include "../../../common/emitter.h"
-#include "../../../common/empty.h"
+#include "../../../common/value_type.h"
 
 CR_EXPORT int cr_main(cr_plugin *ctx, cr_op operation) {
     switch(operation) {

test/lib/emitter/shared/lib.cpp

@@ -1,7 +1,6 @@
 #include <entt/config/config.h>
-#include "../../../common/boxed_type.h"
 #include "../../../common/emitter.h"
-#include "../../../common/empty.h"
+#include "../../../common/value_type.h"
 #include "lib.h"
 
 ENTT_API void emit(test::emitter &emitter) {

test/lib/emitter/shared/main.cpp

@@ -1,8 +1,8 @@
 #include <functional>
 #include <gtest/gtest.h>
 #include <entt/config/config.h>
-#include "../../../common/boxed_type.h"
 #include "../../../common/emitter.h"
+#include "../../../common/value_type.h"
 #include "lib.h"
 
 TEST(Emitter, Shared) {

test/lib/locator/plugin/main.cpp

@@ -3,7 +3,7 @@
 #include <gtest/gtest.h>
 #include <cr.h>
 #include <entt/locator/locator.hpp>
-#include "../../../common/boxed_type.h"
+#include "../../../common/value_type.h"
 #include "userdata.h"
 
 TEST(Locator, Plugin) {

test/lib/locator/plugin/plugin.cpp

@@ -1,6 +1,6 @@
 #include <cr.h>
 #include <entt/locator/locator.hpp>
-#include "../../../common/boxed_type.h"
+#include "../../../common/value_type.h"
 #include "userdata.h"
 
 CR_EXPORT int cr_main(cr_plugin *ctx, cr_op operation) {

test/lib/locator/plugin/userdata.h

@@ -2,7 +2,7 @@
 #define ENTT_LIB_LOCATOR_PLUGIN_USERDATA_H
 
 #include <entt/locator/locator.hpp>
-#include "../../../common/boxed_type.h"
+#include "../../../common/value_type.h"
 
 struct userdata {
     entt::locator<test::boxed_int>::node_type handle{};

test/lib/locator/shared/lib.cpp

@@ -1,6 +1,6 @@
 #include <entt/config/config.h>
 #include <entt/locator/locator.hpp>
-#include "../../../common/boxed_type.h"
+#include "../../../common/value_type.h"
 #include "lib.h"
 
 ENTT_API void set_up(const entt::locator<test::boxed_int>::node_type &handle) {

test/lib/locator/shared/lib.h

@@ -1,6 +1,6 @@
 #include <entt/config/config.h>
 #include <entt/locator/locator.hpp>
-#include "../../../common/boxed_type.h"
+#include "../../../common/value_type.h"
 
 ENTT_API void set_up(const entt::locator<test::boxed_int>::node_type &);
 ENTT_API void use_service(int);

test/lib/locator/shared/main.cpp

@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <entt/config/config.h>
 #include <entt/locator/locator.hpp>
-#include "../../../common/boxed_type.h"
+#include "../../../common/value_type.h"
 #include "lib.h"
 
 TEST(Locator, Shared) {

test/lib/meta/plugin/plugin.cpp

@@ -4,8 +4,7 @@
 #include <entt/meta/context.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
-#include "../../../common/boxed_type.h"
-#include "../../../common/empty.h"
+#include "../../../common/value_type.h"
 #include "userdata.h"
 
 test::boxed_int create_boxed_int(int value) {

test/lib/meta/plugin_std/plugin.cpp

@@ -4,8 +4,7 @@
 #include <entt/meta/context.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
-#include "../../../common/boxed_type.h"
-#include "../../../common/empty.h"
+#include "../../../common/value_type.h"
 #include "userdata.h"
 
 test::boxed_int create_boxed_int(int value) {

test/lib/meta/plugin_std/userdata.h

@@ -6,8 +6,7 @@
 #include <entt/core/type_info.hpp>
 #include <entt/meta/context.hpp>
 #include <entt/meta/meta.hpp>
-#include "../../../common/boxed_type.h"
-#include "../../../common/empty.h"
+#include "../../../common/value_type.h"
 
 #define ASSIGN_TYPE_ID(clazz) \
     template<> \

test/lib/meta/shared/lib.cpp

@@ -4,8 +4,7 @@
 #include <entt/meta/context.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
-#include "../../../common/boxed_type.h"
-#include "../../../common/empty.h"
+#include "../../../common/value_type.h"
 #include "lib.h"
 
 namespace {

test/lib/meta/shared/main.cpp

@@ -5,8 +5,7 @@
 #include <entt/meta/context.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/resolve.hpp>
-#include "../../../common/boxed_type.h"
-#include "../../../common/empty.h"
+#include "../../../common/value_type.h"
 #include "lib.h"
 
 TEST(Meta, Shared) {

test/lib/registry/plugin/main.cpp

@@ -6,8 +6,7 @@
 #include <entt/entity/mixin.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/view.hpp>
-#include "../../../common/boxed_type.h"
-#include "../../../common/empty.h"
+#include "../../../common/value_type.h"
 
 TEST(Registry, Plugin) {
     constexpr auto count = 3;

test/lib/registry/plugin/plugin.cpp

@@ -2,8 +2,7 @@
 #include <entt/entity/mixin.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/view.hpp>
-#include "../../../common/boxed_type.h"
-#include "../../../common/empty.h"
+#include "../../../common/value_type.h"
 
 CR_EXPORT int cr_main(cr_plugin *ctx, cr_op operation) {
     constexpr auto count = 3;

test/lib/registry/shared/lib.cpp

@@ -2,8 +2,7 @@
 #include <entt/entity/mixin.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/view.hpp>
-#include "../../../common/boxed_type.h"
-#include "../../../common/empty.h"
+#include "../../../common/value_type.h"
 #include "lib.h"
 
 template class entt::basic_registry<entt::entity>;

test/lib/registry/shared/main.cpp

@@ -4,8 +4,7 @@
 #include <entt/entity/mixin.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/view.hpp>
-#include "../../../common/boxed_type.h"
-#include "../../../common/empty.h"
+#include "../../../common/value_type.h"
 #include "lib.h"
 
 TEST(Registry, Shared) {

test/lib/view/types.h

@@ -3,7 +3,7 @@
 
 #include <entt/entity/storage.hpp>
 #include <entt/entity/view.hpp>
-#include "../../common/empty.h"
+#include "../../common/value_type.h"
 
 using view_type = entt::basic_view<entt::get_t<entt::storage<test::empty>>, entt::exclude_t<entt::storage<test::empty>>>;