Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2013-06-14 19:18:13 +0100
committerPhil Nash2013-06-14 19:18:13 +0100
commit5ddd6e31e48af87df6fbb242af393d38f45fd54b (patch)
tree31e659062b6ee9654839070a561adef52d9fed1d /include
parent1d3dd71774e030615a1089bfe85871ba2a8d4bac (diff)
downloadcatch3-5ddd6e31e48af87df6fbb242af393d38f45fd54b.tar.gz
Added #define NOMINMAX
- thanks to @robson3 in #171
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_console_colour_impl.hpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/internal/catch_console_colour_impl.hpp b/include/internal/catch_console_colour_impl.hpp
index b1db918c..e63632b1 100644
--- a/include/internal/catch_console_colour_impl.hpp
+++ b/include/internal/catch_console_colour_impl.hpp
@@ -19,6 +19,7 @@ namespace Catch { namespace Detail {
#if defined ( CATCH_PLATFORM_WINDOWS ) /////////////////////////////////////////
+#define NOMINMAX
#include <windows.h>
namespace Catch {
@@ -47,7 +48,7 @@ namespace {
case Colour::LightGrey: return setTextAttribute( FOREGROUND_INTENSITY );
case Colour::BrightRed: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
case Colour::BrightGreen: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
- case Colour::BrightWhite: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+ case Colour::BrightWhite: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
case Colour::Bright: throw std::logic_error( "not a colour" );
}