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

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-01-20 23:24:04 +0100
committerMartin Hořeňovský2020-01-21 10:03:54 +0100
commit26f78f96aa6eed4be97281b5b740ab0cf0466c48 (patch)
tree1ed75a6974a364c78f51c426b0a0044217260952 /src/catch2
parentc381b49c60e7c1d6b354b67ca168b2af58c42f13 (diff)
downloadcatch3-26f78f96aa6eed4be97281b5b740ab0cf0466c48.tar.gz
Start using piecemeal includes in test files
Diffstat (limited to 'src/catch2')
-rw-r--r--src/catch2/catch.hpp8
-rw-r--r--src/catch2/catch_assertionhandler.cpp1
-rw-r--r--src/catch2/catch_capture_matchers.h5
-rw-r--r--src/catch2/catch_decomposer.h13
-rw-r--r--src/catch2/catch_test_macros.hpp4
-rw-r--r--src/catch2/catch_tostring.h2
6 files changed, 20 insertions, 13 deletions
diff --git a/src/catch2/catch.hpp b/src/catch2/catch.hpp
index ced54be5..289f526c 100644
--- a/src/catch2/catch.hpp
+++ b/src/catch2/catch.hpp
@@ -11,14 +11,6 @@
#include <catch2/catch_version_macros.hpp>
-#ifdef __clang__
-# pragma clang system_header
-#elif defined __GNUC__
-# pragma GCC system_header
-#endif
-
-
-
#include <catch2/catch_suppress_warnings.h>
#if !defined(CATCH_CONFIG_IMPL_ONLY)
diff --git a/src/catch2/catch_assertionhandler.cpp b/src/catch2/catch_assertionhandler.cpp
index 892e78a4..03834f1e 100644
--- a/src/catch2/catch_assertionhandler.cpp
+++ b/src/catch2/catch_assertionhandler.cpp
@@ -16,6 +16,7 @@
#include <catch2/catch_interfaces_registry_hub.h>
#include <catch2/catch_capture_matchers.h>
#include <catch2/catch_run_context.h>
+#include <catch2/catch_matchers_string.h>
namespace Catch {
diff --git a/src/catch2/catch_capture_matchers.h b/src/catch2/catch_capture_matchers.h
index 7c8c8fa6..3f883a39 100644
--- a/src/catch2/catch_capture_matchers.h
+++ b/src/catch2/catch_capture_matchers.h
@@ -10,11 +10,6 @@
#include <catch2/catch_capture.hpp>
#include <catch2/catch_matchers.h>
-#include <catch2/catch_matchers_exception.hpp>
-#include <catch2/catch_matchers_floating.h>
-#include <catch2/catch_matchers_generic.hpp>
-#include <catch2/catch_matchers_string.h>
-#include <catch2/catch_matchers_vector.h>
#include <catch2/catch_stringref.h>
namespace Catch {
diff --git a/src/catch2/catch_decomposer.h b/src/catch2/catch_decomposer.h
index e42cfa79..084ad5b3 100644
--- a/src/catch2/catch_decomposer.h
+++ b/src/catch2/catch_decomposer.h
@@ -23,6 +23,14 @@
#pragma warning(disable:4800) // Forcing result to true or false
#endif
+#ifdef __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wsign-compare"
+#elif defined __GNUC__
+# pragma GCC diagnostic push
+# pragma clang diagnostic ignored "-Wsign-compare"
+#endif
+
namespace Catch {
struct ITransientExpression {
@@ -243,5 +251,10 @@ namespace Catch {
#ifdef _MSC_VER
#pragma warning(pop)
#endif
+#ifdef __clang__
+# pragma clang diagnostic pop
+#elif defined __GNUC__
+# pragma GCC diagnostic pop
+#endif
#endif // TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED
diff --git a/src/catch2/catch_test_macros.hpp b/src/catch2/catch_test_macros.hpp
index 0be39bbb..c29c7c14 100644
--- a/src/catch2/catch_test_macros.hpp
+++ b/src/catch2/catch_test_macros.hpp
@@ -7,6 +7,10 @@
#define TWOBLUECUBES_CATCH_TEST_MACROS_HPP_INCLUDED
#include <catch2/catch_capture.hpp>
+#include <catch2/catch_capture_matchers.h>
+#include <catch2/catch_interfaces_exception.h>
+#include <catch2/catch_preprocessor.hpp>
+#include <catch2/catch_section.h>
#include <catch2/catch_test_registry.h>
#if !defined(CATCH_CONFIG_DISABLE)
diff --git a/src/catch2/catch_tostring.h b/src/catch2/catch_tostring.h
index 947c269b..cba24628 100644
--- a/src/catch2/catch_tostring.h
+++ b/src/catch2/catch_tostring.h
@@ -649,6 +649,8 @@ struct ratio_string<std::milli> {
}
#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#include <catch2/catch_interfaces_registry_hub.h>
+
#define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
namespace Catch { \
template<> struct StringMaker<enumName> { \