diff options
| author | Phil Nash | 2015-12-04 10:19:08 +0000 |
|---|---|---|
| committer | Phil Nash | 2015-12-04 10:19:08 +0000 |
| commit | fdc42d0af47f58fa13a42b685bbeaf55a8347673 (patch) | |
| tree | 779ff3d692eeffd33353d89ad7697a592ab5201e /projects/SelfTest/ToStringTuple.cpp | |
| parent | d758428fe297655e558a86cc6a013fcb1bcc8c7d (diff) | |
| parent | d274fc571c3980b5ac04cbe1416cf2205e6c99f7 (diff) | |
| download | catch3-fdc42d0af47f58fa13a42b685bbeaf55a8347673.tar.gz | |
Merged from develop branchv1.3.0
- now v1.3.0
Diffstat (limited to 'projects/SelfTest/ToStringTuple.cpp')
| -rw-r--r-- | projects/SelfTest/ToStringTuple.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/projects/SelfTest/ToStringTuple.cpp b/projects/SelfTest/ToStringTuple.cpp index d1ab02f2..80e54530 100644 --- a/projects/SelfTest/ToStringTuple.cpp +++ b/projects/SelfTest/ToStringTuple.cpp @@ -42,12 +42,14 @@ TEST_CASE( "tuple<tuple<int>,tuple<>,float>", "[toString][tuple]" ) CHECK( "{ { 42 }, { }, 1.2f }" == Catch::toString(value) ); } +#ifdef CATCH_CONFIG_CPP11_NULLPTR TEST_CASE( "tuple<nullptr,int,const char *>", "[toString][tuple]" ) { 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 |