Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/projects/SelfTest/ToStringTuple.cpp
diff options
context:
space:
mode:
authorPhil Nash2017-04-25 12:40:52 +0100
committerPhil Nash2017-04-25 12:40:52 +0100
commit79650e44f47f39e9fa3a70d1c713f95069a0ba8f (patch)
tree3615e719f6b0c06d628a2b04c39901cfc70b369e /projects/SelfTest/ToStringTuple.cpp
parent5c8ea03cc85a750d4d8fdd9da1ef02f645a17cac (diff)
downloadcatch3-79650e44f47f39e9fa3a70d1c713f95069a0ba8f.tar.gz
Removed more C++98/03 compatibility
Diffstat (limited to 'projects/SelfTest/ToStringTuple.cpp')
-rw-r--r--projects/SelfTest/ToStringTuple.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/projects/SelfTest/ToStringTuple.cpp b/projects/SelfTest/ToStringTuple.cpp
index fa61f631..86f68d37 100644
--- a/projects/SelfTest/ToStringTuple.cpp
+++ b/projects/SelfTest/ToStringTuple.cpp
@@ -1,11 +1,6 @@
#include "catch.hpp"
-#ifdef CATCH_CPP11_OR_GREATER
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++98-compat"
-#endif
+#include <tuple>
TEST_CASE( "tuple<>", "[toString][tuple][c++11][.]" )
{
@@ -42,18 +37,10 @@ TEST_CASE( "tuple<tuple<int>,tuple<>,float>", "[toString][tuple][c++11][.]" )
CHECK( "{ { 42 }, { }, 1.2f }" == Catch::toString(value) );
}
-#ifdef CATCH_CONFIG_CPP11_NULLPTR
TEST_CASE( "tuple<nullptr,int,const char *>", "[toString][tuple][c++11][.]" )
{
typedef std::tuple<std::nullptr_t,int,const char *> type;
type value { nullptr, 42, "Catch me" };
CHECK( "{ nullptr, 42, \"Catch me\" }" == Catch::toString(value) );
}
-#endif
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#endif /* #ifdef CATCH_CPP11_OR_GREATER */