From 02c97cd0f7c4d630f1a90f9f2626746e47a28c09 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 5 Feb 2017 15:45:26 +0100 Subject: Updated Catch to latest (nw) --- 3rdparty/catch/projects/SelfTest/ToStringTuple.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '3rdparty/catch/projects/SelfTest/ToStringTuple.cpp') diff --git a/3rdparty/catch/projects/SelfTest/ToStringTuple.cpp b/3rdparty/catch/projects/SelfTest/ToStringTuple.cpp index 80e5453097a..fa61f631440 100644 --- a/3rdparty/catch/projects/SelfTest/ToStringTuple.cpp +++ b/3rdparty/catch/projects/SelfTest/ToStringTuple.cpp @@ -7,7 +7,7 @@ #pragma clang diagnostic ignored "-Wc++98-compat" #endif -TEST_CASE( "tuple<>", "[toString][tuple]" ) +TEST_CASE( "tuple<>", "[toString][tuple][c++11][.]" ) { typedef std::tuple<> type; CHECK( "{ }" == Catch::toString(type{}) ); @@ -15,27 +15,27 @@ TEST_CASE( "tuple<>", "[toString][tuple]" ) CHECK( "{ }" == Catch::toString(value) ); } -TEST_CASE( "tuple", "[toString][tuple]" ) +TEST_CASE( "tuple", "[toString][tuple][c++11][.]" ) { typedef std::tuple type; CHECK( "{ 0 }" == Catch::toString(type{0}) ); } -TEST_CASE( "tuple", "[toString][tuple]" ) +TEST_CASE( "tuple", "[toString][tuple][c++11][.]" ) { typedef std::tuple type; CHECK( "1.2f" == Catch::toString(float(1.2)) ); CHECK( "{ 1.2f, 0 }" == Catch::toString(type{1.2,0}) ); } -TEST_CASE( "tuple", "[toString][tuple]" ) +TEST_CASE( "tuple", "[toString][tuple][c++11][.]" ) { typedef std::tuple type; CHECK( "{ \"hello\", \"world\" }" == Catch::toString(type{"hello","world"}) ); } -TEST_CASE( "tuple,tuple<>,float>", "[toString][tuple]" ) +TEST_CASE( "tuple,tuple<>,float>", "[toString][tuple][c++11][.]" ) { typedef std::tuple,std::tuple<>,float> type; type value { std::tuple{42}, {}, 1.2f }; @@ -43,7 +43,7 @@ TEST_CASE( "tuple,tuple<>,float>", "[toString][tuple]" ) } #ifdef CATCH_CONFIG_CPP11_NULLPTR -TEST_CASE( "tuple", "[toString][tuple]" ) +TEST_CASE( "tuple", "[toString][tuple][c++11][.]" ) { typedef std::tuple type; type value { nullptr, 42, "Catch me" }; -- cgit v1.2.3-70-g09d2