Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

guard NOMINMAX definition (windows)

Commit
4b5e008b20da8c6e11c6192710d60cdb2c884056
Author
Phil Nash ·
Parents
cd688300b047

Files · Download .tar.gz

Changes

 README.md                                       | 2 +-
 include/internal/catch_console_colour_impl.hpp  | 2 ++
 include/internal/catch_version.hpp              | 2 +-
 projects/SelfTest/Baselines/approvedResults.txt | 4 ++--
 single_include/catch.hpp                        | 8 +++++---
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index d49b6ca5..8bca9e55 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![catch logo](catch-logo-small.png)
 
-*v1.0 build 2 (master branch)*
+*v1.0 build 3 (master branch)*
 
 # New release with significant changes
 
diff --git a/include/internal/catch_console_colour_impl.hpp b/include/internal/catch_console_colour_impl.hpp
index e63632b1..3881dc43 100644
--- a/include/internal/catch_console_colour_impl.hpp
+++ b/include/internal/catch_console_colour_impl.hpp
@@ -19,7 +19,9 @@ namespace Catch { namespace Detail {
 
 #if defined ( CATCH_PLATFORM_WINDOWS ) /////////////////////////////////////////
 
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 
 namespace Catch {
diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp
index 89a5efe6..04d86c7e 100644
--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -13,7 +13,7 @@
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 1, 0, 2, "master" );
+    Version libraryVersion( 1, 0, 3, "master" );
 }
 
 #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt
index d7a1c4d9..b6988262 100644
--- a/projects/SelfTest/Baselines/approvedResults.txt
+++ b/projects/SelfTest/Baselines/approvedResults.txt
@@ -1,6 +1,6 @@
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-CatchSelfTest is a Catch v1.0 b2 host application.
+CatchSelfTest is a Catch v1.0 b3 host application.
 Run with -? for options
 
 -------------------------------------------------------------------------------
@@ -682,7 +682,7 @@ with expansion:
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-CatchSelfTest is a Catch v1.0 b2 host application.
+CatchSelfTest is a Catch v1.0 b3 host application.
 Run with -? for options
 
 -------------------------------------------------------------------------------
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index 84635d16..5c218306 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,6 +1,6 @@
 /*
- *  CATCH v1.0 build 2 (master branch)
- *  Generated: 2013-06-29 12:10:25.613092
+ *  CATCH v1.0 build 3 (master branch)
+ *  Generated: 2013-06-29 20:29:59.351244
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -5738,7 +5738,9 @@ namespace Catch { namespace Detail {
 
 #if defined ( CATCH_PLATFORM_WINDOWS ) /////////////////////////////////////////
 
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 
 namespace Catch {
@@ -6224,7 +6226,7 @@ namespace Catch {
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 1, 0, 2, "master" );
+    Version libraryVersion( 1, 0, 3, "master" );
 }
 
 // #included from: catch_text.hpp