From 84b394ec451f2462f54c93d6490c11329a7a5da8 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Tue, 29 Mar 2011 08:05:47 +0100 Subject: [PATCH] debug stream fixes --- catch_runner.hpp | 4 ++-- internal/catch_debugger.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/catch_runner.hpp b/catch_runner.hpp index 5506ac04..15d76e8b 100644 --- a/catch_runner.hpp +++ b/catch_runner.hpp @@ -137,8 +137,8 @@ namespace Catch ) { Config config; - if( isDebuggerActive() ) - config.useStream( "debug" ); +// if( isDebuggerActive() ) +// config.useStream( "debug" ); return Main( argc, argv, config ); } diff --git a/internal/catch_debugger.hpp b/internal/catch_debugger.hpp index 2e6970dc..f8306e71 100644 --- a/internal/catch_debugger.hpp +++ b/internal/catch_debugger.hpp @@ -92,7 +92,7 @@ #define BreakIntoDebugger() if (IsDebuggerPresent() ) { __debugbreak(); } inline bool isDebuggerActive() { - return IsDebuggerPresent(); + return IsDebuggerPresent() != 0; } #else inline void BreakIntoDebugger(){}