From 1c30113338ea98f6935fb4f7dd55768e6c243d1f Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Mon, 18 Mar 2024 08:21:20 -0700 Subject: [PATCH] build: update bazel common test target (#1124) --- test/common/BUILD.bazel | 2 +- test/entt/container/dense_map.cpp | 10 +++++----- test/entt/container/dense_set.cpp | 8 ++++---- test/entt/core/algorithm.cpp | 2 +- test/entt/core/any.cpp | 10 +++++----- test/entt/core/compressed_pair.cpp | 4 ++-- test/entt/core/ident.cpp | 4 ++-- test/entt/core/iterator.cpp | 2 +- test/entt/core/memory.cpp | 10 +++++----- test/entt/core/type_traits.cpp | 2 +- test/entt/entity/BUILD.bazel | 4 ++-- test/entt/entity/component.cpp | 6 +++--- test/entt/entity/entity.cpp | 2 +- test/entt/entity/group.cpp | 6 +++--- test/entt/entity/helper.cpp | 2 +- test/entt/entity/registry.cpp | 12 ++++++------ test/entt/entity/runtime_view.cpp | 4 ++-- test/entt/entity/sigh_mixin.cpp | 12 ++++++------ test/entt/entity/snapshot.cpp | 4 ++-- test/entt/entity/sparse_set.cpp | 8 ++++---- test/entt/entity/storage.cpp | 14 +++++++------- test/entt/entity/storage_entity.cpp | 4 ++-- test/entt/entity/storage_no_instance.cpp | 6 +++--- test/entt/entity/view.cpp | 6 +++--- test/entt/graph/adjacency_matrix.cpp | 4 ++-- test/entt/graph/flow.cpp | 6 +++--- test/entt/locator/locator.cpp | 2 +- test/entt/meta/BUILD.bazel | 4 ++-- test/entt/meta/meta_any.cpp | 6 +++--- test/entt/meta/meta_container.cpp | 6 +++--- test/entt/meta/meta_context.cpp | 2 +- test/entt/meta/meta_data.cpp | 2 +- test/entt/meta/meta_func.cpp | 2 +- test/entt/meta/meta_pointer.cpp | 2 +- test/entt/meta/meta_type.cpp | 2 +- test/entt/meta/meta_utility.cpp | 4 ++-- test/entt/poly/poly.cpp | 4 ++-- test/entt/process/process.cpp | 2 +- test/entt/resource/resource.cpp | 2 +- test/entt/resource/resource_cache.cpp | 4 ++-- test/entt/signal/delegate.cpp | 2 +- test/entt/signal/emitter.cpp | 8 ++++---- test/entt/signal/sigh.cpp | 2 +- test/lib/dispatcher/plugin/main.cpp | 4 ++-- test/lib/dispatcher/plugin/plugin.cpp | 4 ++-- test/lib/dispatcher/shared/lib.cpp | 4 ++-- test/lib/dispatcher/shared/main.cpp | 4 ++-- test/lib/emitter/plugin/main.cpp | 4 ++-- test/lib/emitter/plugin/plugin.cpp | 6 +++--- test/lib/emitter/shared/lib.cpp | 6 +++--- test/lib/emitter/shared/main.cpp | 4 ++-- test/lib/locator/plugin/main.cpp | 2 +- test/lib/locator/plugin/plugin.cpp | 2 +- test/lib/locator/plugin/userdata.h | 2 +- test/lib/locator/shared/lib.cpp | 2 +- test/lib/locator/shared/main.cpp | 2 +- test/lib/meta/plugin/plugin.cpp | 4 ++-- test/lib/meta/plugin_std/plugin.cpp | 4 ++-- test/lib/meta/plugin_std/userdata.h | 4 ++-- test/lib/meta/shared/lib.cpp | 6 +++--- test/lib/meta/shared/main.cpp | 6 +++--- test/lib/registry/plugin/main.cpp | 4 ++-- test/lib/registry/plugin/plugin.cpp | 4 ++-- test/lib/registry/shared/lib.cpp | 4 ++-- test/lib/registry/shared/main.cpp | 4 ++-- 65 files changed, 148 insertions(+), 148 deletions(-) diff --git a/test/common/BUILD.bazel b/test/common/BUILD.bazel index 4cb0a1425..95582520a 100644 --- a/test/common/BUILD.bazel +++ b/test/common/BUILD.bazel @@ -1,5 +1,5 @@ -load("@rules_cc//cc:defs.bzl", "cc_library") load("@entt//bazel:copts.bzl", "COPTS") +load("@rules_cc//cc:defs.bzl", "cc_library") package(default_visibility = ["//:__subpackages__"]) diff --git a/test/entt/container/dense_map.cpp b/test/entt/container/dense_map.cpp index 19557972f..c0b2d5a8c 100644 --- a/test/entt/container/dense_map.cpp +++ b/test/entt/container/dense_map.cpp @@ -9,11 +9,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "common/config.h" +#include "common/linter.hpp" +#include "common/throwing_allocator.hpp" +#include "common/tracked_memory_resource.hpp" +#include "common/transparent_equal_to.h" #include #include #include diff --git a/test/entt/container/dense_set.cpp b/test/entt/container/dense_set.cpp index 183eb171f..a3e8f01a1 100644 --- a/test/entt/container/dense_set.cpp +++ b/test/entt/container/dense_set.cpp @@ -9,10 +9,10 @@ #include #include #include -#include -#include -#include -#include +#include "common/linter.hpp" +#include "common/throwing_allocator.hpp" +#include "common/tracked_memory_resource.hpp" +#include "common/transparent_equal_to.h" #include #include #include diff --git a/test/entt/core/algorithm.cpp b/test/entt/core/algorithm.cpp index 768cbd358..899bcb172 100644 --- a/test/entt/core/algorithm.cpp +++ b/test/entt/core/algorithm.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include "common/boxed_type.h" #include TEST(Algorithm, StdSort) { diff --git a/test/entt/core/any.cpp b/test/entt/core/any.cpp index ceaafa009..92c5bd88a 100644 --- a/test/entt/core/any.cpp +++ b/test/entt/core/any.cpp @@ -7,11 +7,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "common/aggregate.h" +#include "common/config.h" +#include "common/linter.hpp" +#include "common/non_comparable.h" +#include "common/non_movable.h" #include #include diff --git a/test/entt/core/compressed_pair.cpp b/test/entt/core/compressed_pair.cpp index 0e0740326..9a6778678 100644 --- a/test/entt/core/compressed_pair.cpp +++ b/test/entt/core/compressed_pair.cpp @@ -5,8 +5,8 @@ #include #include #include -#include -#include +#include "common/empty.h" +#include "common/non_default_constructible.h" #include TEST(CompressedPair, Size) { diff --git a/test/entt/core/ident.cpp b/test/entt/core/ident.cpp index e91e101b6..7820e6dc1 100644 --- a/test/entt/core/ident.cpp +++ b/test/entt/core/ident.cpp @@ -1,7 +1,7 @@ #include #include -#include -#include +#include "common/boxed_type.h" +#include "common/empty.h" #include TEST(Ident, Uniqueness) { diff --git a/test/entt/core/iterator.cpp b/test/entt/core/iterator.cpp index 608975aa9..90c1d71b7 100644 --- a/test/entt/core/iterator.cpp +++ b/test/entt/core/iterator.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include "common/boxed_type.h" #include TEST(InputIteratorPointer, Functionalities) { diff --git a/test/entt/core/memory.cpp b/test/entt/core/memory.cpp index d1bb3eade..e4fabdba3 100644 --- a/test/entt/core/memory.cpp +++ b/test/entt/core/memory.cpp @@ -8,11 +8,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "common/basic_test_allocator.hpp" +#include "common/config.h" +#include "common/throwing_allocator.hpp" +#include "common/throwing_type.hpp" +#include "common/tracked_memory_resource.hpp" #include TEST(ToAddress, Functionalities) { diff --git a/test/entt/core/type_traits.cpp b/test/entt/core/type_traits.cpp index aace84ffd..f72ee441d 100644 --- a/test/entt/core/type_traits.cpp +++ b/test/entt/core/type_traits.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include "common/non_comparable.h" #include #include diff --git a/test/entt/entity/BUILD.bazel b/test/entt/entity/BUILD.bazel index 26eb55b21..b2a60beff 100644 --- a/test/entt/entity/BUILD.bazel +++ b/test/entt/entity/BUILD.bazel @@ -1,5 +1,5 @@ -load("@rules_cc//cc:defs.bzl", "cc_test") load("@entt//bazel:copts.bzl", "COPTS") +load("@rules_cc//cc:defs.bzl", "cc_test") # buildifier: keep sorted _TESTS = [ @@ -27,7 +27,7 @@ _TESTS = [ srcs = ["{}.cpp".format(test)], copts = COPTS, deps = [ - "//entt/common", + "//common", "@entt", "@googletest//:gtest", "@googletest//:gtest_main", diff --git a/test/entt/entity/component.cpp b/test/entt/entity/component.cpp index 59491c72b..833936da6 100644 --- a/test/entt/entity/component.cpp +++ b/test/entt/entity/component.cpp @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include "common/boxed_type.h" +#include "common/empty.h" +#include "common/non_movable.h" #include #include diff --git a/test/entt/entity/entity.cpp b/test/entt/entity/entity.cpp index 0297faa72..b892ea3c9 100644 --- a/test/entt/entity/entity.cpp +++ b/test/entt/entity/entity.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include "common/entity.h" #include #include diff --git a/test/entt/entity/group.cpp b/test/entt/entity/group.cpp index 56ced7cea..a4eb042b5 100644 --- a/test/entt/entity/group.cpp +++ b/test/entt/entity/group.cpp @@ -5,9 +5,9 @@ #include #include #include -#include -#include -#include +#include "common/boxed_type.h" +#include "common/config.h" +#include "common/empty.h" #include #include diff --git a/test/entt/entity/helper.cpp b/test/entt/entity/helper.cpp index c337a6203..5cd89550c 100644 --- a/test/entt/entity/helper.cpp +++ b/test/entt/entity/helper.cpp @@ -1,5 +1,5 @@ #include -#include +#include "common/pointer_stable.h" #include #include #include diff --git a/test/entt/entity/registry.cpp b/test/entt/entity/registry.cpp index be79d658a..ca5e83128 100644 --- a/test/entt/entity/registry.cpp +++ b/test/entt/entity/registry.cpp @@ -9,12 +9,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include "common/aggregate.h" +#include "common/config.h" +#include "common/empty.h" +#include "common/entity.h" +#include "common/non_default_constructible.h" +#include "common/pointer_stable.h" #include #include #include diff --git a/test/entt/entity/runtime_view.cpp b/test/entt/entity/runtime_view.cpp index 39dec73a3..6d7cafe4c 100644 --- a/test/entt/entity/runtime_view.cpp +++ b/test/entt/entity/runtime_view.cpp @@ -2,8 +2,8 @@ #include #include #include -#include -#include +#include "common/linter.hpp" +#include "common/pointer_stable.h" #include #include #include diff --git a/test/entt/entity/sigh_mixin.cpp b/test/entt/entity/sigh_mixin.cpp index 31a5217ae..b61ab85c6 100644 --- a/test/entt/entity/sigh_mixin.cpp +++ b/test/entt/entity/sigh_mixin.cpp @@ -4,12 +4,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include "common/entity.h" +#include "common/linter.hpp" +#include "common/non_default_constructible.h" +#include "common/pointer_stable.h" +#include "common/throwing_allocator.hpp" +#include "common/throwing_type.hpp" #include #include #include diff --git a/test/entt/entity/snapshot.cpp b/test/entt/entity/snapshot.cpp index 1cc2558fd..de84e854c 100644 --- a/test/entt/entity/snapshot.cpp +++ b/test/entt/entity/snapshot.cpp @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include "common/config.h" +#include "common/empty.h" #include #include #include diff --git a/test/entt/entity/sparse_set.cpp b/test/entt/entity/sparse_set.cpp index 86756d98b..87a1ef61c 100644 --- a/test/entt/entity/sparse_set.cpp +++ b/test/entt/entity/sparse_set.cpp @@ -6,10 +6,10 @@ #include #include #include -#include -#include -#include -#include +#include "common/config.h" +#include "common/entity.h" +#include "common/linter.hpp" +#include "common/throwing_allocator.hpp" #include #include #include diff --git a/test/entt/entity/storage.cpp b/test/entt/entity/storage.cpp index acf380af0..c63e335c4 100644 --- a/test/entt/entity/storage.cpp +++ b/test/entt/entity/storage.cpp @@ -7,13 +7,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include "common/aggregate.h" +#include "common/config.h" +#include "common/linter.hpp" +#include "common/pointer_stable.h" +#include "common/throwing_allocator.hpp" +#include "common/throwing_type.hpp" +#include "common/tracked_memory_resource.hpp" #include #include #include diff --git a/test/entt/entity/storage_entity.cpp b/test/entt/entity/storage_entity.cpp index 2a57e7eda..943af7648 100644 --- a/test/entt/entity/storage_entity.cpp +++ b/test/entt/entity/storage_entity.cpp @@ -7,8 +7,8 @@ #include #include #include -#include -#include +#include "common/config.h" +#include "common/linter.hpp" #include #include #include diff --git a/test/entt/entity/storage_no_instance.cpp b/test/entt/entity/storage_no_instance.cpp index cd12a9103..a9eac4f41 100644 --- a/test/entt/entity/storage_no_instance.cpp +++ b/test/entt/entity/storage_no_instance.cpp @@ -6,9 +6,9 @@ #include #include #include -#include -#include -#include +#include "common/config.h" +#include "common/empty.h" +#include "common/linter.hpp" #include #include #include diff --git a/test/entt/entity/view.cpp b/test/entt/entity/view.cpp index c4ce641c2..43302602b 100644 --- a/test/entt/entity/view.cpp +++ b/test/entt/entity/view.cpp @@ -4,9 +4,9 @@ #include #include #include -#include -#include -#include +#include "common/boxed_type.h" +#include "common/empty.h" +#include "common/pointer_stable.h" #include #include #include diff --git a/test/entt/graph/adjacency_matrix.cpp b/test/entt/graph/adjacency_matrix.cpp index b73e97dc2..ad3180180 100644 --- a/test/entt/graph/adjacency_matrix.cpp +++ b/test/entt/graph/adjacency_matrix.cpp @@ -2,8 +2,8 @@ #include #include #include -#include -#include +#include "common/linter.hpp" +#include "common/throwing_allocator.hpp" #include TEST(AdjacencyMatrix, Resize) { diff --git a/test/entt/graph/flow.cpp b/test/entt/graph/flow.cpp index c77a196b6..e56ab7e01 100644 --- a/test/entt/graph/flow.cpp +++ b/test/entt/graph/flow.cpp @@ -3,9 +3,9 @@ #include #include #include -#include -#include -#include +#include "common/config.h" +#include "common/linter.hpp" +#include "common/throwing_allocator.hpp" #include #include diff --git a/test/entt/locator/locator.cpp b/test/entt/locator/locator.cpp index d34cf0465..01215cae4 100644 --- a/test/entt/locator/locator.cpp +++ b/test/entt/locator/locator.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include "common/config.h" #include struct base_service { diff --git a/test/entt/meta/BUILD.bazel b/test/entt/meta/BUILD.bazel index 704865039..498ee708b 100644 --- a/test/entt/meta/BUILD.bazel +++ b/test/entt/meta/BUILD.bazel @@ -1,5 +1,5 @@ -load("@rules_cc//cc:defs.bzl", "cc_test") load("@entt//bazel:copts.bzl", "COPTS") +load("@rules_cc//cc:defs.bzl", "cc_test") # buildifier: keep sorted _TESTS = [ @@ -26,7 +26,7 @@ _TESTS = [ srcs = ["{}.cpp".format(test)], copts = COPTS, deps = [ - "//entt/common", + "//common", "@entt", "@googletest//:gtest", "@googletest//:gtest_main", diff --git a/test/entt/meta/meta_any.cpp b/test/entt/meta/meta_any.cpp index 6c25d4315..cd88e3f0d 100644 --- a/test/entt/meta/meta_any.cpp +++ b/test/entt/meta/meta_any.cpp @@ -4,9 +4,9 @@ #include #include #include -#include -#include -#include +#include "common/config.h" +#include "common/linter.hpp" +#include "common/non_comparable.h" #include #include #include diff --git a/test/entt/meta/meta_container.cpp b/test/entt/meta/meta_container.cpp index 67cd4abd2..689fa2977 100644 --- a/test/entt/meta/meta_container.cpp +++ b/test/entt/meta/meta_container.cpp @@ -6,9 +6,9 @@ #include #include #include -#include -#include -#include +#include "common/config.h" +#include "common/empty.h" +#include "common/non_default_constructible.h" #include #include #include diff --git a/test/entt/meta/meta_context.cpp b/test/entt/meta/meta_context.cpp index 79053d516..5df9cbd80 100644 --- a/test/entt/meta/meta_context.cpp +++ b/test/entt/meta/meta_context.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include "common/empty.h" #include #include #include diff --git a/test/entt/meta/meta_data.cpp b/test/entt/meta/meta_data.cpp index ced3a9791..60f53cc62 100644 --- a/test/entt/meta/meta_data.cpp +++ b/test/entt/meta/meta_data.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include "common/config.h" #include #include #include diff --git a/test/entt/meta/meta_func.cpp b/test/entt/meta/meta_func.cpp index b7f9a5544..4e19ce836 100644 --- a/test/entt/meta/meta_func.cpp +++ b/test/entt/meta/meta_func.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include "common/config.h" #include #include #include diff --git a/test/entt/meta/meta_pointer.cpp b/test/entt/meta/meta_pointer.cpp index 608a8b890..9268a3a28 100644 --- a/test/entt/meta/meta_pointer.cpp +++ b/test/entt/meta/meta_pointer.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include "common/config.h" #include #include #include diff --git a/test/entt/meta/meta_type.cpp b/test/entt/meta/meta_type.cpp index 4089ff485..5b0845083 100644 --- a/test/entt/meta/meta_type.cpp +++ b/test/entt/meta/meta_type.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include "common/config.h" #include #include #include diff --git a/test/entt/meta/meta_utility.cpp b/test/entt/meta/meta_utility.cpp index e96272b2a..c1698df74 100644 --- a/test/entt/meta/meta_utility.cpp +++ b/test/entt/meta/meta_utility.cpp @@ -2,8 +2,8 @@ #include #include #include -#include -#include +#include "common/config.h" +#include "common/empty.h" #include #include #include diff --git a/test/entt/poly/poly.cpp b/test/entt/poly/poly.cpp index 84444e976..1150c8e8c 100644 --- a/test/entt/poly/poly.cpp +++ b/test/entt/poly/poly.cpp @@ -3,8 +3,8 @@ #include #include #include -#include -#include +#include "common/config.h" +#include "common/linter.hpp" #include #include #include diff --git a/test/entt/process/process.cpp b/test/entt/process/process.cpp index acffac72d..b2dc10cd3 100644 --- a/test/entt/process/process.cpp +++ b/test/entt/process/process.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include "common/empty.h" #include template diff --git a/test/entt/resource/resource.cpp b/test/entt/resource/resource.cpp index 1e189b4ca..bfdb87855 100644 --- a/test/entt/resource/resource.cpp +++ b/test/entt/resource/resource.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include "common/linter.hpp" #include #include diff --git a/test/entt/resource/resource_cache.cpp b/test/entt/resource/resource_cache.cpp index 81bb8e2ec..e2c44c055 100644 --- a/test/entt/resource/resource_cache.cpp +++ b/test/entt/resource/resource_cache.cpp @@ -3,8 +3,8 @@ #include #include #include -#include -#include +#include "common/linter.hpp" +#include "common/throwing_allocator.hpp" #include #include #include diff --git a/test/entt/signal/delegate.cpp b/test/entt/signal/delegate.cpp index 1206c6610..b43b94192 100644 --- a/test/entt/signal/delegate.cpp +++ b/test/entt/signal/delegate.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include "common/config.h" #include int power_of_two(const int &i) { diff --git a/test/entt/signal/emitter.cpp b/test/entt/signal/emitter.cpp index c36d7546d..ab94690e7 100644 --- a/test/entt/signal/emitter.cpp +++ b/test/entt/signal/emitter.cpp @@ -2,10 +2,10 @@ #include #include #include -#include -#include -#include -#include +#include "common/boxed_type.h" +#include "common/emitter.h" +#include "common/empty.h" +#include "common/linter.hpp" #include TEST(Emitter, Move) { diff --git a/test/entt/signal/sigh.cpp b/test/entt/signal/sigh.cpp index 9b2576090..0ddd3a6d9 100644 --- a/test/entt/signal/sigh.cpp +++ b/test/entt/signal/sigh.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include "common/linter.hpp" #include struct sigh_listener { diff --git a/test/lib/dispatcher/plugin/main.cpp b/test/lib/dispatcher/plugin/main.cpp index 70da836d2..e2086459c 100644 --- a/test/lib/dispatcher/plugin/main.cpp +++ b/test/lib/dispatcher/plugin/main.cpp @@ -1,8 +1,8 @@ #define CR_HOST #include -#include -#include +#include "common/boxed_type.h" +#include "common/listener.h" #include #include diff --git a/test/lib/dispatcher/plugin/plugin.cpp b/test/lib/dispatcher/plugin/plugin.cpp index 9f10ee029..88e42914d 100644 --- a/test/lib/dispatcher/plugin/plugin.cpp +++ b/test/lib/dispatcher/plugin/plugin.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "common/boxed_type.h" +#include "common/empty.h" #include #include diff --git a/test/lib/dispatcher/shared/lib.cpp b/test/lib/dispatcher/shared/lib.cpp index a871612ab..3f993bae3 100644 --- a/test/lib/dispatcher/shared/lib.cpp +++ b/test/lib/dispatcher/shared/lib.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "common/boxed_type.h" +#include "common/empty.h" #include #include diff --git a/test/lib/dispatcher/shared/main.cpp b/test/lib/dispatcher/shared/main.cpp index 6e466642d..184bbf9e4 100644 --- a/test/lib/dispatcher/shared/main.cpp +++ b/test/lib/dispatcher/shared/main.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include "common/boxed_type.h" +#include "common/listener.h" #include #include #include diff --git a/test/lib/emitter/plugin/main.cpp b/test/lib/emitter/plugin/main.cpp index e408993a7..ad10ca957 100644 --- a/test/lib/emitter/plugin/main.cpp +++ b/test/lib/emitter/plugin/main.cpp @@ -2,8 +2,8 @@ #include #include -#include -#include +#include "common/boxed_type.h" +#include "common/emitter.h" #include TEST(Lib, Emitter) { diff --git a/test/lib/emitter/plugin/plugin.cpp b/test/lib/emitter/plugin/plugin.cpp index 0a2c15c48..9dcae5fba 100644 --- a/test/lib/emitter/plugin/plugin.cpp +++ b/test/lib/emitter/plugin/plugin.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "common/boxed_type.h" +#include "common/emitter.h" +#include "common/empty.h" #include CR_EXPORT int cr_main(cr_plugin *ctx, cr_op operation) { diff --git a/test/lib/emitter/shared/lib.cpp b/test/lib/emitter/shared/lib.cpp index be29dc054..5bbfd3074 100644 --- a/test/lib/emitter/shared/lib.cpp +++ b/test/lib/emitter/shared/lib.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "common/boxed_type.h" +#include "common/emitter.h" +#include "common/empty.h" #include ENTT_API void emit(test::emitter &emitter) { diff --git a/test/lib/emitter/shared/main.cpp b/test/lib/emitter/shared/main.cpp index 8292a7368..c46dffc06 100644 --- a/test/lib/emitter/shared/main.cpp +++ b/test/lib/emitter/shared/main.cpp @@ -1,7 +1,7 @@ #include #include -#include -#include +#include "common/boxed_type.h" +#include "common/emitter.h" #include ENTT_API void emit(test::emitter &); diff --git a/test/lib/locator/plugin/main.cpp b/test/lib/locator/plugin/main.cpp index 766581be9..8c13d625b 100644 --- a/test/lib/locator/plugin/main.cpp +++ b/test/lib/locator/plugin/main.cpp @@ -1,7 +1,7 @@ #define CR_HOST #include -#include +#include "common/boxed_type.h" #include #include #include "userdata.h" diff --git a/test/lib/locator/plugin/plugin.cpp b/test/lib/locator/plugin/plugin.cpp index 8d85222c6..786492b18 100644 --- a/test/lib/locator/plugin/plugin.cpp +++ b/test/lib/locator/plugin/plugin.cpp @@ -1,4 +1,4 @@ -#include +#include "common/boxed_type.h" #include #include #include "userdata.h" diff --git a/test/lib/locator/plugin/userdata.h b/test/lib/locator/plugin/userdata.h index 2f4078a49..fed7a877c 100644 --- a/test/lib/locator/plugin/userdata.h +++ b/test/lib/locator/plugin/userdata.h @@ -1,7 +1,7 @@ #ifndef ENTT_LIB_LOCATOR_PLUGIN_USERDATA_H #define ENTT_LIB_LOCATOR_PLUGIN_USERDATA_H -#include +#include "common/boxed_type.h" #include struct userdata { diff --git a/test/lib/locator/shared/lib.cpp b/test/lib/locator/shared/lib.cpp index abbc2eae1..9795111de 100644 --- a/test/lib/locator/shared/lib.cpp +++ b/test/lib/locator/shared/lib.cpp @@ -1,4 +1,4 @@ -#include +#include "common/boxed_type.h" #include #include diff --git a/test/lib/locator/shared/main.cpp b/test/lib/locator/shared/main.cpp index 20052be9f..d0c22f8b9 100644 --- a/test/lib/locator/shared/main.cpp +++ b/test/lib/locator/shared/main.cpp @@ -1,5 +1,5 @@ #include -#include +#include "common/boxed_type.h" #include #include diff --git a/test/lib/meta/plugin/plugin.cpp b/test/lib/meta/plugin/plugin.cpp index bfbe35b4e..e005cdefd 100644 --- a/test/lib/meta/plugin/plugin.cpp +++ b/test/lib/meta/plugin/plugin.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "common/boxed_type.h" +#include "common/empty.h" #include #include #include diff --git a/test/lib/meta/plugin_std/plugin.cpp b/test/lib/meta/plugin_std/plugin.cpp index bfbe35b4e..e005cdefd 100644 --- a/test/lib/meta/plugin_std/plugin.cpp +++ b/test/lib/meta/plugin_std/plugin.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "common/boxed_type.h" +#include "common/empty.h" #include #include #include diff --git a/test/lib/meta/plugin_std/userdata.h b/test/lib/meta/plugin_std/userdata.h index 843711041..3fbbca01f 100644 --- a/test/lib/meta/plugin_std/userdata.h +++ b/test/lib/meta/plugin_std/userdata.h @@ -2,8 +2,8 @@ #define ENTT_LIB_META_PLUGIN_STD_USERDATA_H #include -#include -#include +#include "common/boxed_type.h" +#include "common/empty.h" #include #include #include diff --git a/test/lib/meta/shared/lib.cpp b/test/lib/meta/shared/lib.cpp index 3d204fa29..93b624edd 100644 --- a/test/lib/meta/shared/lib.cpp +++ b/test/lib/meta/shared/lib.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "common/boxed_type.h" +#include "common/empty.h" #include #include #include @@ -19,7 +19,7 @@ ENTT_API void set_up() { using namespace entt::literals; entt::meta() - .type("boxed_int"_hs) + .type(mboxed_intm_hs) .ctor<&create_boxed_int>() .data<&test::boxed_int::value>("value"_hs); diff --git a/test/lib/meta/shared/main.cpp b/test/lib/meta/shared/main.cpp index fc97a18c9..561c8ba3c 100644 --- a/test/lib/meta/shared/main.cpp +++ b/test/lib/meta/shared/main.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include "common/boxed_type.h" +#include "common/empty.h" #include #include #include @@ -16,7 +16,7 @@ ENTT_API entt::meta_any wrap_int(int); TEST(Lib, Meta) { using namespace entt::literals; - ASSERT_FALSE(entt::resolve("boxed_int"_hs)); + ASSERT_FALSE(entt::resolve(mboxed_int"_hs)); ASSERT_FALSE(entt::resolve("empty"_hs)); share(entt::locator::handle()); diff --git a/test/lib/registry/plugin/main.cpp b/test/lib/registry/plugin/main.cpp index cee2b2dc2..735f776ba 100644 --- a/test/lib/registry/plugin/main.cpp +++ b/test/lib/registry/plugin/main.cpp @@ -1,8 +1,8 @@ #define CR_HOST #include -#include -#include +#include "common/boxed_type.h" +#include "common/empty.h" #include #include #include diff --git a/test/lib/registry/plugin/plugin.cpp b/test/lib/registry/plugin/plugin.cpp index fb9ea149d..31780c8e8 100644 --- a/test/lib/registry/plugin/plugin.cpp +++ b/test/lib/registry/plugin/plugin.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "common/boxed_type.h" +#include "common/empty.h" #include #include diff --git a/test/lib/registry/shared/lib.cpp b/test/lib/registry/shared/lib.cpp index 01a367cd0..d68f27e32 100644 --- a/test/lib/registry/shared/lib.cpp +++ b/test/lib/registry/shared/lib.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "common/boxed_type.h" +#include "common/empty.h" #include #include diff --git a/test/lib/registry/shared/main.cpp b/test/lib/registry/shared/main.cpp index e145f7ed0..a094e5ab2 100644 --- a/test/lib/registry/shared/main.cpp +++ b/test/lib/registry/shared/main.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include "common/boxed_type.h" +#include "common/empty.h" #include #include #include