3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 13:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix how windows.h is included in our files.

Browse Source 
To prevent bugs with stitching system headers inside Catch,
the proxy header is responsible for guarding against inclusion
on Linux, rather than the includers.

Might be related to #1197
This commit is contained in:
Martin Hořeňovský 2018-02-23 12:40:12 +01:00
parent 4e57661919
commit 0c5df42c28
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/internal/catch_debug_console.cpp
View File

@ -9,21 +9,23 @@
#include "catch_debug_console.h" #include "catch_debug_console.h"
#include "catch_stream.h" #include "catch_stream.h"
#include "catch_platform.h" #include "catch_platform.h"
#include "catch_windows_h_proxy.h"
#ifdef CATCH_PLATFORM_WINDOWS #ifdef CATCH_PLATFORM_WINDOWS
#include "catch_windows_h_proxy.h"
namespace Catch { namespace Catch {
void writeToDebugConsole( std::string const& text ) { void writeToDebugConsole( std::string const& text ) {
::OutputDebugStringA( text.c_str() ); ::OutputDebugStringA( text.c_str() );
} }
} }
#else #else
namespace Catch { namespace Catch {
void writeToDebugConsole( std::string const& text ) { void writeToDebugConsole( std::string const& text ) {
// !TBD: Need a version for Mac/ XCode and other IDEs // !TBD: Need a version for Mac/ XCode and other IDEs
Catch::cout() << text; Catch::cout() << text;
} }
} }
#endif // Platform #endif // Platform

4
include/internal/catch_fatal_condition.h
View File

@ -9,13 +9,13 @@
#ifndef TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED
#define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED #define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED
#include <string>
#include "catch_platform.h" #include "catch_platform.h"
#include "catch_compiler_capabilities.h" #include "catch_compiler_capabilities.h"
#include "catch_windows_h_proxy.h"
#if defined ( CATCH_PLATFORM_WINDOWS ) ///////////////////////////////////////// #if defined ( CATCH_PLATFORM_WINDOWS ) /////////////////////////////////////////
#include "catch_windows_h_proxy.h"
# if !defined ( CATCH_CONFIG_WINDOWS_SEH ) # if !defined ( CATCH_CONFIG_WINDOWS_SEH )

1
include/internal/catch_session.cpp
View File

@ -19,6 +19,7 @@
#include "catch_startup_exception_registry.h" #include "catch_startup_exception_registry.h"
#include "catch_text.h" #include "catch_text.h"
#include "catch_stream.h" #include "catch_stream.h"
#include "catch_windows_h_proxy.h"
#include <cstdlib> #include <cstdlib>
#include <iomanip> #include <iomanip>