diff options
| author | Phil Nash | 2011-12-27 10:59:41 +0000 |
|---|---|---|
| committer | Phil Nash | 2011-12-27 10:59:41 +0000 |
| commit | 458e5eec16496e18a461842f0b5fe9fcd889b89a (patch) | |
| tree | 68174b21b632468095e8a02165ab62992dd51e06 /include | |
| parent | f7e27776655726f4d8470fcfb70e6edbebf3da0a (diff) | |
| download | catch3-458e5eec16496e18a461842f0b5fe9fcd889b89a.tar.gz | |
Xcode 4, warnings and MinGW
Added separate Xcode 4 project.
Fixed some warnings.
Fixed OutputDebugString decl for MinGW
Diffstat (limited to 'include')
| -rw-r--r-- | include/catch_runner.hpp | 2 | ||||
| -rw-r--r-- | include/internal/catch_debugger.hpp | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/include/catch_runner.hpp b/include/catch_runner.hpp index 3b859443..c4ccb519 100644 --- a/include/catch_runner.hpp +++ b/include/catch_runner.hpp @@ -82,7 +82,7 @@ namespace Catch } ////////////////////////////////////////////////////////////////////////// - void showHelp + inline void showHelp ( std::string exeName ) diff --git a/include/internal/catch_debugger.hpp b/include/internal/catch_debugger.hpp index 54e4f67c..9986ecf4 100644 --- a/include/internal/catch_debugger.hpp +++ b/include/internal/catch_debugger.hpp @@ -88,7 +88,6 @@ #elif defined(_MSC_VER) extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent(); - extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA( const char* ); #define BreakIntoDebugger() if (IsDebuggerPresent() ) { __debugbreak(); } inline bool isDebuggerActive() { @@ -99,14 +98,18 @@ inline bool isDebuggerActive() { return false; } #endif +#ifdef CATCH_PLATFORM_WINDOWS +extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA( const char* ); inline void writeToDebugConsole( const std::string& text ) { -#ifdef CATCH_PLATFORM_WINDOWS - ::OutputDebugStringA( text.c_str() ); + ::OutputDebugStringA( text.c_str() ); +} #else +inline void writeToDebugConsole( const std::string& text ) +{ // !TBD: Need a version for Mac/ XCode and other IDEs std::cout << text; -#endif } +#endif // CATCH_PLATFORM_WINDOWS #endif // TWOBLUECUBES_CATCH_DEBUGGER_HPP_INCLUDED |