catchorg/Catch2
1
0
Fork 1
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-03 20:54:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Phil Nash
2017-10-12 10:37:03 +01:00
parent cc0b093c20
commit 927f520a97
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/catch.hpp
View File

@@ -62,7 +62,6 @@
#endif #endif
#ifdef CATCH_IMPL #ifdef CATCH_IMPL
#include "internal/catch_windows_h_proxy.h"
#include "internal/catch_impl.hpp" #include "internal/catch_impl.hpp"
#endif #endif

3
include/internal/catch_console_colour.cpp
View File

@@ -21,6 +21,7 @@
#include "catch_context.h" #include "catch_context.h"
#include "catch_platform.h" #include "catch_platform.h"
#include "catch_debugger.h" #include "catch_debugger.h"
#include "catch_windows_h_proxy.h"
namespace Catch { namespace Catch {
namespace { namespace {
@@ -53,8 +54,6 @@ namespace Catch {
#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) ///////////////////////////////////////// #if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
#include "catch_windows_h_proxy.h"
namespace Catch { namespace Catch {
namespace { namespace {