From 9012f9596405c979aed23d43269033c37d6595d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sun, 12 Feb 2017 12:17:07 +0100 Subject: [PATCH] Moved some std includes out from catch_common.h --- include/internal/catch_common.h | 2 -- include/internal/catch_common.hpp | 1 + include/internal/catch_config.hpp | 1 + include/internal/catch_test_case_info.hpp | 2 ++ include/internal/catch_test_case_tracker.hpp | 1 + include/internal/catch_wildcard_pattern.hpp | 3 +++ 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h index 455a2fab..6bdcccb8 100644 --- a/include/internal/catch_common.h +++ b/include/internal/catch_common.h @@ -22,9 +22,7 @@ #define INTERNAL_CATCH_STRINGIFY( expr ) INTERNAL_CATCH_STRINGIFY2( expr ) #include -#include #include -#include #include "catch_compiler_capabilities.h" diff --git a/include/internal/catch_common.hpp b/include/internal/catch_common.hpp index cca775e5..339f0407 100644 --- a/include/internal/catch_common.hpp +++ b/include/internal/catch_common.hpp @@ -11,6 +11,7 @@ #include "catch_common.h" #include +#include namespace Catch { diff --git a/include/internal/catch_config.hpp b/include/internal/catch_config.hpp index 437686a8..2f4c25e9 100644 --- a/include/internal/catch_config.hpp +++ b/include/internal/catch_config.hpp @@ -18,6 +18,7 @@ #include #include #include +#include #ifndef CATCH_CONFIG_CONSOLE_WIDTH #define CATCH_CONFIG_CONSOLE_WIDTH 80 diff --git a/include/internal/catch_test_case_info.hpp b/include/internal/catch_test_case_info.hpp index abba5d99..b4ca53ad 100644 --- a/include/internal/catch_test_case_info.hpp +++ b/include/internal/catch_test_case_info.hpp @@ -13,6 +13,8 @@ #include "catch_interfaces_testcase.h" #include "catch_common.h" +#include + namespace Catch { inline TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) { diff --git a/include/internal/catch_test_case_tracker.hpp b/include/internal/catch_test_case_tracker.hpp index 5a866336..9526e281 100644 --- a/include/internal/catch_test_case_tracker.hpp +++ b/include/internal/catch_test_case_tracker.hpp @@ -16,6 +16,7 @@ #include #include #include +#include namespace Catch { namespace TestCaseTracking { diff --git a/include/internal/catch_wildcard_pattern.hpp b/include/internal/catch_wildcard_pattern.hpp index 6ce66a4d..a922912d 100644 --- a/include/internal/catch_wildcard_pattern.hpp +++ b/include/internal/catch_wildcard_pattern.hpp @@ -10,6 +10,9 @@ #include "catch_common.h" +#include + + namespace Catch { class WildcardPattern {