Enable C++23

Remove unmove, which doesn't compile with C++23 and was only used for convenience in a test.
fair-acc · Apr 26, 2024 · 37e6fb4 · 37e6fb4
1 parent 283a2c8
commit 37e6fb4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.19)
 
 project(opencmw-cpp CXX)
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 
 # include(cmake/StandardProjectSettings.cmake)
 include(cmake/PreventInSourceBuilds.cmake)

diff --git a/src/core/include/opencmw.hpp b/src/core/include/opencmw.hpp
@@ -44,8 +44,6 @@ constexpr bool always_false = false;
 using units::basic_fixed_string;
 using units::is_same_v;
 
-constexpr auto &unmove(auto &&t) { return t; } // opposite of std::move(...)
-
 template<typename R, typename Fn, typename... FnArgs>
 concept invocable_r = std::is_invocable_r_v<R, Fn, FnArgs...>;
 

diff --git a/src/core/test/00_opencmw_basic_tests.cpp b/src/core/test/00_opencmw_basic_tests.cpp
@@ -20,10 +20,6 @@ static_assert(no_fwd_wrapper(0) == 1, "r-value non-forwarding -> converted to lv
 static_assert(fwd_wrapper_verbose(0) == 2, "r-value forwarding");
 static_assert(fwd_wrapper(0) == 2, "r-value forwarding");
 
-/**** unmove(..) tests ***/
-static_assert(fwd_wrapper(unmove(lvalue)) == 1, "l-value -> l-value forwarding (copy)");
-static_assert(fwd_wrapper(unmove(0)) == 1, "r-value -> lvalue forwarding (copy)");
-
 /**** power 2 and bit-magic tests ***/
 static_assert(isPower2(1024U));
 static_assert(is_power2_v<1024U>);

diff --git a/src/serialiser/test/IoSerialiserYaS_tests.cpp b/src/serialiser/test/IoSerialiserYaS_tests.cpp
@@ -447,8 +447,10 @@ TEST_CASE("IoSerialiser basic syntax", "[IoSerialiser]") {
         REQUIRE(opencmw::is_annotated<decltype(data.value)> == true);
         std::cout << fmt::format("buffer size (before): {} bytes\n", buffer.size());
 
-        opencmw::FieldHeaderWriter<opencmw::YaS>::template put<true>(buffer, unmove(FieldDescriptionShort{ .fieldName = "fieldNameA" }), 43.0);
-        opencmw::FieldHeaderWriter<opencmw::YaS>::template put<true>(buffer, unmove(FieldDescriptionShort{ .fieldName = "fieldNameB" }), data.value.value());
+        auto fieldA = FieldDescriptionShort{ .fieldName = "fieldNameA" };
+        opencmw::FieldHeaderWriter<opencmw::YaS>::template put<true>(buffer, fieldA, 43.0);
+        auto fieldB = FieldDescriptionShort{ .fieldName = "fieldNameB" };
+        opencmw::FieldHeaderWriter<opencmw::YaS>::template put<true>(buffer, fieldB, data.value.value());
         std::cout << fmt::format("buffer size (after): {} bytes\n", buffer.size());
     }
     REQUIRE(opencmw::debug::dealloc == opencmw::debug::alloc); // a memory leak occurred