Skip to content

Commit

Permalink
Merge pull request #554 from NAThompson/atomic_compatibility
Browse files Browse the repository at this point in the history
Ensure mp-units are compatible with std::atomic
  • Loading branch information
mpusz authored Feb 10, 2024
2 parents cb3fd00 + 34eac6a commit 2889658
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 1 deletion.
2 changes: 1 addition & 1 deletion test/runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
37 changes: 37 additions & 0 deletions test/runtime/atomic_test.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// 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/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<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());
}

0 comments on commit 2889658

Please sign in to comment.