mirror of
https://github.com/catchorg/Catch2.git
synced 2025-09-23 13:05:39 +02:00
Upgrade to C++17
This commit is contained in:
@@ -514,7 +514,7 @@ add_executable(AmalgamatedTestCompilation
|
||||
${CATCH_DIR}/extras/catch_amalgamated.cpp
|
||||
)
|
||||
target_include_directories(AmalgamatedTestCompilation PRIVATE ${CATCH_DIR}/extras)
|
||||
target_compile_features(AmalgamatedTestCompilation PRIVATE cxx_std_14)
|
||||
target_compile_features(AmalgamatedTestCompilation PRIVATE cxx_std_17)
|
||||
|
||||
add_test(NAME AmalgamatedFileTest COMMAND AmalgamatedTestCompilation)
|
||||
set_tests_properties(AmalgamatedFileTest
|
||||
|
@@ -72,10 +72,10 @@ CATCH_TEST_CASE("PrefixedMacros") {
|
||||
}
|
||||
}
|
||||
|
||||
CATCH_STATIC_REQUIRE( std::is_void<void>::value );
|
||||
CATCH_STATIC_REQUIRE_FALSE( std::is_void<int>::value );
|
||||
CATCH_STATIC_CHECK( std::is_void<void>::value );
|
||||
CATCH_STATIC_CHECK_FALSE( std::is_void<int>::value );
|
||||
CATCH_STATIC_REQUIRE( std::is_void_v<void> );
|
||||
CATCH_STATIC_REQUIRE_FALSE( std::is_void_v<int> );
|
||||
CATCH_STATIC_CHECK( std::is_void_v<void> );
|
||||
CATCH_STATIC_CHECK_FALSE( std::is_void_v<int> );
|
||||
CATCH_FAIL("");
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user