Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Moved windows proxy inclusion outside of CATCH_CONFIG_COLOUR_WINDOWS guard, so workaround early inclusion can be removed

Commit
927f520a9731d5a10ec1a16deb15759ee6609528
Author
Phil Nash ·
Parents
cc0b093c2018

Files · Download .tar.gz

Changes

 include/catch.hpp                         | 1 -
 include/internal/catch_console_colour.cpp | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/catch.hpp b/include/catch.hpp
index edb588d1..118337c9 100644
--- a/include/catch.hpp
+++ b/include/catch.hpp
@@ -62,7 +62,6 @@
 #endif
 
 #ifdef CATCH_IMPL
-#include "internal/catch_windows_h_proxy.h"
 #include "internal/catch_impl.hpp"
 #endif
 
diff --git a/include/internal/catch_console_colour.cpp b/include/internal/catch_console_colour.cpp
index 946e2903..8b055b33 100644
--- a/include/internal/catch_console_colour.cpp
+++ b/include/internal/catch_console_colour.cpp
@@ -21,6 +21,7 @@
 #include "catch_context.h"
 #include "catch_platform.h"
 #include "catch_debugger.h"
+#include "catch_windows_h_proxy.h"
 
 namespace Catch {
     namespace {
@@ -53,8 +54,6 @@ namespace Catch {
 
 #if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
 
-#include "catch_windows_h_proxy.h"
-
 namespace Catch {
 namespace {