3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 12:55:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

guard NOMINMAX definition (windows)

Browse Source
This commit is contained in:
Phil Nash
2013-06-29 20:31:17 +01:00
parent cd688300b0
commit 4b5e008b20
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_console_colour_impl.hpp
View File

@@ -19,7 +19,9 @@ namespace Catch { namespace Detail {
#if defined ( CATCH_PLATFORM_WINDOWS ) /////////////////////////////////////////
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
namespace Catch {

2
include/internal/catch_version.hpp
View File

@@ -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