From c313c2c083a8699351b3d97d7d0523d53dcd87f4 Mon Sep 17 00:00:00 2001
From: Nick Thompson <nathompson7@protonmail.com>
Date: Sat, 10 Feb 2024 08:33:52 -0800
Subject: [PATCH 1/3] Ensure mp-units are compatible with std::atomic

---
 test/runtime/CMakeLists.txt  |  2 +-
 test/runtime/atomic_test.cpp | 40 ++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 test/runtime/atomic_test.cpp

diff --git a/test/runtime/CMakeLists.txt b/test/runtime/CMakeLists.txt
index b22c70227..897957a98 100644
--- a/test/runtime/CMakeLists.txt
+++ b/test/runtime/CMakeLists.txt
@@ -24,7 +24,7 @@ cmake_minimum_required(VERSION 3.5)
 
 find_package(Catch2 3 REQUIRED)
 
-add_executable(unit_tests_runtime distribution_test.cpp fmt_test.cpp math_test.cpp)
+add_executable(unit_tests_runtime distribution_test.cpp fmt_test.cpp math_test.cpp atomic_test.cpp)
 if(${projectPrefix}BUILD_CXX_MODULES)
     target_compile_definitions(unit_tests_runtime PUBLIC ${projectPrefix}MODULES)
 endif()
diff --git a/test/runtime/atomic_test.cpp b/test/runtime/atomic_test.cpp
new file mode 100644
index 000000000..800626dc8
--- /dev/null
+++ b/test/runtime/atomic_test.cpp
@@ -0,0 +1,40 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2024 Nick Thompson
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#include <catch2/catch_all.hpp>
+#include <mp-units/math.h>
+#include <mp-units/ostream.h>
+#include <mp-units/systems/angular/angular.h>
+#include <mp-units/systems/isq/space_and_time.h>
+#include <mp-units/systems/si/unit_symbols.h>
+#include <mp-units/systems/si/units.h>
+#include <atomic>
+
+using namespace mp_units;
+using namespace mp_units::si::unit_symbols;
+
+TEST_CASE("std::atomic works with dimensioned types", "[atomic][assignment]")
+{
+  std::atomic<isq::area[m2]> a = 3.0 * isq::area[m2];
+  std::atomic<isq::area[m2]> b = 3.0 * isq::area[m2];
+  REQUIRE(a == b);
+}

From 947baa6d676fd8a34dcfdebade61df58d6198853 Mon Sep 17 00:00:00 2001
From: Nick <NAThompson@users.noreply.github.com>
Date: Sat, 10 Feb 2024 09:35:04 -0800
Subject: [PATCH 2/3] Update test/runtime/atomic_test.cpp

Co-authored-by: Mateusz Pusz <mateusz.pusz@gmail.com>
---
 test/runtime/atomic_test.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/runtime/atomic_test.cpp b/test/runtime/atomic_test.cpp
index 800626dc8..2269f2cad 100644
--- a/test/runtime/atomic_test.cpp
+++ b/test/runtime/atomic_test.cpp
@@ -34,7 +34,7 @@ using namespace mp_units::si::unit_symbols;
 
 TEST_CASE("std::atomic works with dimensioned types", "[atomic][assignment]")
 {
-  std::atomic<isq::area[m2]> a = 3.0 * isq::area[m2];
-  std::atomic<isq::area[m2]> b = 3.0 * isq::area[m2];
+  std::atomic<quantity<isq::area[m2]>> a = 3.0 * isq::area[m2];
+  std::atomic<quantity<isq::area[m2]>> b = 3.0 * isq::area[m2];
   REQUIRE(a == b);
 }

From 34eac6a61e4dcfb903cc11e2df083a0176a8c1a1 Mon Sep 17 00:00:00 2001
From: Nick <NAThompson@users.noreply.github.com>
Date: Sat, 10 Feb 2024 09:52:26 -0800
Subject: [PATCH 3/3] Update test/runtime/atomic_test.cpp

Co-authored-by: Mateusz Pusz <mateusz.pusz@gmail.com>
---
 test/runtime/atomic_test.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/test/runtime/atomic_test.cpp b/test/runtime/atomic_test.cpp
index 2269f2cad..ba382edf7 100644
--- a/test/runtime/atomic_test.cpp
+++ b/test/runtime/atomic_test.cpp
@@ -21,9 +21,6 @@
 // SOFTWARE.
 
 #include <catch2/catch_all.hpp>
-#include <mp-units/math.h>
-#include <mp-units/ostream.h>
-#include <mp-units/systems/angular/angular.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/unit_symbols.h>
 #include <mp-units/systems/si/units.h>
@@ -34,7 +31,7 @@ using namespace mp_units::si::unit_symbols;
 
 TEST_CASE("std::atomic works with dimensioned types", "[atomic][assignment]")
 {
-  std::atomic<quantity<isq::area[m2]>> a = 3.0 * isq::area[m2];
-  std::atomic<quantity<isq::area[m2]>> b = 3.0 * isq::area[m2];
-  REQUIRE(a == b);
+  std::atomic<quantity<isq::area[m2]>> a1 = 3.0 * isq::area[m2];
+  std::atomic<quantity<isq::area[m2]>> a2 = 3.0 * isq::area[m2];
+  REQUIRE(a1.load() == a2.load());
 }