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

summaryrefslogtreecommitdiffhomepage
path: root/projects
diff options
context:
space:
mode:
authorPhil Nash2015-07-03 18:27:36 +0100
committerPhil Nash2015-07-03 18:27:36 +0100
commitd6f1446e4e5dc36af5e760d41f5edd7f361abda2 (patch)
tree2f38a9f04608e931e69795dcf8ec61a60680a52b /projects
parent62e517f83325ece83f65b14a01283b5e5c001160 (diff)
downloadcatch3-d6f1446e4e5dc36af5e760d41f5edd7f361abda2.tar.gz
Fixed an issue on some compilers with implicit conversion from nullptr to Ptr
- also cleaned up some warnings to do with CATCH_NULL
Diffstat (limited to 'projects')
-rw-r--r--projects/SelfTest/CmdLineTests.cpp3
-rw-r--r--projects/SelfTest/ConditionTests.cpp3
-rw-r--r--projects/SelfTest/SectionTrackerTests.cpp3
-rw-r--r--projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp2
-rw-r--r--projects/SelfTest/TestMain.cpp5
5 files changed, 12 insertions, 4 deletions
diff --git a/projects/SelfTest/CmdLineTests.cpp b/projects/SelfTest/CmdLineTests.cpp
index 955bcd3d..719c89b8 100644
--- a/projects/SelfTest/CmdLineTests.cpp
+++ b/projects/SelfTest/CmdLineTests.cpp
@@ -9,6 +9,9 @@
#include "catch.hpp"
#include "catch_test_spec_parser.hpp"
+#ifdef __clang__
+# pragma clang diagnostic ignored "-Wc++98-compat"
+#endif
inline Catch::TestCase fakeTestCase( const char* name, const char* desc = "" ){ return Catch::makeTestCase( CATCH_NULL, "", name, desc, CATCH_INTERNAL_LINEINFO ); }
diff --git a/projects/SelfTest/ConditionTests.cpp b/projects/SelfTest/ConditionTests.cpp
index 910021ce..195188ac 100644
--- a/projects/SelfTest/ConditionTests.cpp
+++ b/projects/SelfTest/ConditionTests.cpp
@@ -6,7 +6,8 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/
#ifdef __clang__
-#pragma clang diagnostic ignored "-Wpadded"
+# pragma clang diagnostic ignored "-Wpadded"
+# pragma clang diagnostic ignored "-Wc++98-compat"
#endif
#include "catch.hpp"
diff --git a/projects/SelfTest/SectionTrackerTests.cpp b/projects/SelfTest/SectionTrackerTests.cpp
index 03d856d8..96e96f5e 100644
--- a/projects/SelfTest/SectionTrackerTests.cpp
+++ b/projects/SelfTest/SectionTrackerTests.cpp
@@ -7,7 +7,8 @@
*/
#ifdef __clang__
-#pragma clang diagnostic ignored "-Wpadded"
+# pragma clang diagnostic ignored "-Wpadded"
+# pragma clang diagnostic ignored "-Wc++98-compat"
#endif
#include "internal/catch_test_case_tracker.hpp"
diff --git a/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp b/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp
index ca853847..15328efe 100644
--- a/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp
@@ -1,2 +1,4 @@
// This file is only here to verify (to the extent possible) the self sufficiency of the header
+#include "catch_suppress_warnings.h"
#include "catch_xmlwriter.hpp"
+#include "catch_reenable_warnings.h"
diff --git a/projects/SelfTest/TestMain.cpp b/projects/SelfTest/TestMain.cpp
index dae87f0c..bb2cf417 100644
--- a/projects/SelfTest/TestMain.cpp
+++ b/projects/SelfTest/TestMain.cpp
@@ -16,8 +16,9 @@ CATCH_REGISTER_TAG_ALIAS( "[@tricky]", "[tricky]~[.]" )
#ifdef __clang__
-#pragma clang diagnostic ignored "-Wpadded"
-#pragma clang diagnostic ignored "-Wweak-vtables"
+# pragma clang diagnostic ignored "-Wpadded"
+# pragma clang diagnostic ignored "-Wweak-vtables"
+# pragma clang diagnostic ignored "-Wc++98-compat"
#endif