From 86042727a43c365988224e59cf596f585c7ec22c Mon Sep 17 00:00:00 2001
From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
Date: Tue, 31 Jan 2023 16:37:52 +0100
Subject: [PATCH] Fix some ODR violations

Those turned up when playing with unity builds in cmake.
---
 tests/mapping.BitPackedFloat.cpp |  8 ++++---
 tests/mapping.BitPackedInt.cpp   |  6 ++---
 tests/view.cpp                   | 38 ++++++++++++++++----------------
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/tests/mapping.BitPackedFloat.cpp b/tests/mapping.BitPackedFloat.cpp
index aaeaf79dbe..1de06cf3e4 100644
--- a/tests/mapping.BitPackedFloat.cpp
+++ b/tests/mapping.BitPackedFloat.cpp
@@ -140,15 +140,15 @@ TEMPLATE_TEST_CASE("mapping.BitPackedFloatSoA", "", float, double)
     }
 }
 
-constexpr auto n = std::size_t{1000};
 TEMPLATE_TEST_CASE(
     "mapping.BitPackedFloatSoA.ReducedPrecisionComputation",
     "",
     (llama::mapping::
-         BitPackedFloatAoS<llama::ArrayExtents<std::size_t, n>, Vec3D, llama::Constant<8>, llama::Constant<23>>),
+         BitPackedFloatAoS<llama::ArrayExtents<std::size_t, 1000>, Vec3D, llama::Constant<8>, llama::Constant<23>>),
     (llama::mapping::
-         BitPackedFloatSoA<llama::ArrayExtents<std::size_t, n>, Vec3D, llama::Constant<8>, llama::Constant<23>>) )
+         BitPackedFloatSoA<llama::ArrayExtents<std::size_t, 1000>, Vec3D, llama::Constant<8>, llama::Constant<23>>) )
 {
+    constexpr auto n = std::size_t{1000};
     auto view = llama::allocView(llama::mapping::AoS<llama::ArrayExtents<std::size_t, n>, Vec3D>{{}});
     std::default_random_engine engine;
     std::uniform_real_distribution dist{0.0f, 1e20f};
@@ -183,6 +183,7 @@ TEMPLATE_TEST_CASE(
 
 TEST_CASE("mapping.BitPackedFloatAoS.blobs")
 {
+    constexpr auto n = std::size_t{1000};
     using Mapping = llama::mapping::
         BitPackedFloatAoS<llama::ArrayExtents<std::size_t, n>, Vec3D, llama::Constant<3>, llama::Constant<5>>;
     STATIC_REQUIRE(Mapping::blobCount == 1);
@@ -194,6 +195,7 @@ TEST_CASE("mapping.BitPackedFloatAoS.blobs")
 
 TEST_CASE("mapping.BitPackedFloatSoA.blobs")
 {
+    constexpr auto n = std::size_t{1000};
     using Mapping = llama::mapping::
         BitPackedFloatSoA<llama::ArrayExtents<std::size_t, n>, Vec3D, llama::Constant<3>, llama::Constant<5>>;
     STATIC_REQUIRE(Mapping::blobCount == 3);
diff --git a/tests/mapping.BitPackedInt.cpp b/tests/mapping.BitPackedInt.cpp
index 87ca5d8efc..6b2ca837ee 100644
--- a/tests/mapping.BitPackedInt.cpp
+++ b/tests/mapping.BitPackedInt.cpp
@@ -122,13 +122,13 @@ TEMPLATE_TEST_CASE(
     }
 }
 
-constexpr auto n = 1000;
 TEMPLATE_TEST_CASE(
     "mapping.BitPackedInt.SInts.Roundtrip",
     "",
-    (llama::mapping::BitPackedIntSoA<llama::ArrayExtents<std::size_t, n>, Vec3I, llama::Constant<12>>),
-    (llama::mapping::BitPackedIntAoS<llama::ArrayExtents<std::size_t, n>, Vec3I, llama::Constant<12>>) )
+    (llama::mapping::BitPackedIntSoA<llama::ArrayExtents<std::size_t, 1000>, Vec3I, llama::Constant<12>>),
+    (llama::mapping::BitPackedIntAoS<llama::ArrayExtents<std::size_t, 1000>, Vec3I, llama::Constant<12>>) )
 {
+    constexpr auto n = 1000;
     auto view = llama::allocView(llama::mapping::AoS<llama::ArrayExtents<std::size_t, n>, Vec3I>{});
     std::default_random_engine engine;
     std::uniform_int_distribution dist{-2000, 2000}; // fits into 12 bits
diff --git a/tests/view.cpp b/tests/view.cpp
index 0ce350fee2..b225fc678b 100644
--- a/tests/view.cpp
+++ b/tests/view.cpp
@@ -3,40 +3,40 @@
 #include <atomic>
 #include <deque>
 
-// clang-format off
 namespace tag
 {
-    struct Value {};
+    struct Value
+    {
+    };
 } // namespace tag
 
-using RecordDim = llama::Record<
-    llama::Field<tag::Value, int>
->;
-// clang-format on
+using RecordDimJustInt = llama::Record<llama::Field<tag::Value, int>>;
 
 TEST_CASE("view.default-ctor")
 {
     using ArrayExtents = llama::ArrayExtentsDynamic<std::size_t, 2>;
-    [[maybe_unused]] const llama::View<llama::mapping::AlignedAoS<ArrayExtents, RecordDim>, std::byte*> view1{};
-    [[maybe_unused]] const llama::View<llama::mapping::PackedAoS<ArrayExtents, RecordDim>, std::byte*> view2{};
-    [[maybe_unused]] const llama::View<llama::mapping::AlignedSingleBlobSoA<ArrayExtents, RecordDim>, std::byte*>
-        view3{};
-    [[maybe_unused]] const llama::View<llama::mapping::PackedSingleBlobSoA<ArrayExtents, RecordDim>, std::byte*>
+    [[maybe_unused]] const llama::View<llama::mapping::AlignedAoS<ArrayExtents, RecordDimJustInt>, std::byte*> view1{};
+    [[maybe_unused]] const llama::View<llama::mapping::PackedAoS<ArrayExtents, RecordDimJustInt>, std::byte*> view2{};
+    [[maybe_unused]] const llama::
+        View<llama::mapping::AlignedSingleBlobSoA<ArrayExtents, RecordDimJustInt>, std::byte*>
+            view3{};
+    [[maybe_unused]] const llama::View<llama::mapping::PackedSingleBlobSoA<ArrayExtents, RecordDimJustInt>, std::byte*>
         view4{};
-    [[maybe_unused]] const llama::View<llama::mapping::MultiBlobSoA<ArrayExtents, RecordDim>, std::byte*> view5{};
-    [[maybe_unused]] const llama::View<llama::mapping::One<ArrayExtents, RecordDim>, std::byte*> view6{};
+    [[maybe_unused]] const llama::View<llama::mapping::MultiBlobSoA<ArrayExtents, RecordDimJustInt>, std::byte*>
+        view5{};
+    [[maybe_unused]] const llama::View<llama::mapping::One<ArrayExtents, RecordDimJustInt>, std::byte*> view6{};
     [[maybe_unused]] const llama::
-        View<llama::mapping::tree::Mapping<ArrayExtents, RecordDim, llama::Tuple<>>, std::byte*>
+        View<llama::mapping::tree::Mapping<ArrayExtents, RecordDimJustInt, llama::Tuple<>>, std::byte*>
             view7{};
 }
 //
 // TEST_CASE("view.trivial")
 //{
 //    using ArrayExtents = llama::ArrayExtents<std::size_t, 2, llama::dyn>;
-//    using Mapping = llama::mapping::AlignedAoS<ArrayExtents, RecordDim>;
+//    using Mapping = llama::mapping::AlignedAoS<ArrayExtents, RecordDimJustInt>;
 //    constexpr auto s = Mapping{{10}}.blobSize(0);
 //    using BlobType = decltype(llama::bloballoc::Stack<s>{}(std::integral_constant<std::size_t, 4>{}, 0));
-//    using View = llama::View<llama::mapping::AlignedAoS<ArrayExtents, RecordDim>, BlobType>;
+//    using View = llama::View<llama::mapping::AlignedAoS<ArrayExtents, RecordDimJustInt>, BlobType>;
 //    STATIC_REQUIRE(std::is_trivially_constructible_v<View>);
 //    STATIC_REQUIRE(std::is_trivial_v<View>);
 //    STATIC_REQUIRE(std::is_trivial_v<View>);
@@ -47,7 +47,7 @@ TEST_CASE("view.move")
     using ArrayExtents = llama::ArrayExtentsDynamic<std::size_t, 2>;
     constexpr ArrayExtents viewSize{16, 16};
 
-    using Mapping = llama::mapping::SoA<ArrayExtents, RecordDim>;
+    using Mapping = llama::mapping::SoA<ArrayExtents, RecordDimJustInt>;
     auto view1 = llama::allocView(Mapping(viewSize));
 
     decltype(view1) view2;
@@ -61,7 +61,7 @@ TEST_CASE("view.swap")
     using ArrayExtents = llama::ArrayExtentsDynamic<std::size_t, 2>;
     constexpr ArrayExtents viewSize{16, 16};
 
-    using Mapping = llama::mapping::SoA<ArrayExtents, RecordDim>;
+    using Mapping = llama::mapping::SoA<ArrayExtents, RecordDimJustInt>;
     auto view1 = llama::allocView(Mapping(viewSize));
     auto view2 = llama::allocView(Mapping(viewSize));
 
@@ -83,7 +83,7 @@ TEST_CASE("view.non-memory-owning")
         using ArrayExtents = llama::ArrayExtentsDynamic<std::size_t, 1>;
         const ArrayExtents extents{256};
 
-        using Mapping = llama::mapping::SoA<ArrayExtents, RecordDim>;
+        using Mapping = llama::mapping::SoA<ArrayExtents, RecordDimJustInt>;
         const Mapping mapping{extents};
 
         const auto blobSize = mapping.blobSize(0);