3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-17 03:02:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Detect C++11 support for Visual Studio 2015.

Browse Source
This commit is contained in:
Vaclav Zeman 2015-01-12 13:29:43 +01:00
parent b9ec8a10ed
commit 39f31c4cef
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
![catch logo](catch-logo-small.png) ![catch logo](catch-logo-small.png)
*v1.0 build 53 (master branch)* *v1.0 build 55 (master branch)*
Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch) Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)

7
include/internal/catch_compiler_capabilities.h
View File

@ -84,6 +84,10 @@
//#define CATCH_CONFIG_SFINAE // Not confirmed //#define CATCH_CONFIG_SFINAE // Not confirmed
#endif #endif
#if (_MSC_VER >= 1900 ) // (VC++ 2015)
#define CATCH_CONFIG_CPP11_NULLPTR
#endif
#endif // _MSC_VER #endif // _MSC_VER
// Use variadic macros if the compiler supports them // Use variadic macros if the compiler supports them
@ -102,7 +106,8 @@
// C++ language feature support // C++ language feature support
// detect language version: // detect language version:
#if (__cplusplus == 201103L) #if (__cplusplus == 201103L) || \
(defined(_MSC_VER) && _MSC_VER >= 1900)
# define CATCH_CPP11 # define CATCH_CPP11
# define CATCH_CPP11_OR_GREATER # define CATCH_CPP11_OR_GREATER
#elif (__cplusplus >= 201103L) #elif (__cplusplus >= 201103L)

2
include/internal/catch_version.hpp
View File

@ -13,7 +13,7 @@
namespace Catch { namespace Catch {
// These numbers are maintained by a script // These numbers are maintained by a script
Version libraryVersion( 1, 0, 53, "master" ); Version libraryVersion( 1, 0, 55, "master" );
} }
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

17
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* CATCH v1.0 build 53 (master branch) * CATCH v1.0 build 55 (master branch)
* Generated: 2014-08-20 08:08:19.533804 * Generated: 2015-01-12 13:26:44.228000
* ---------------------------------------------------------- * ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -139,6 +139,10 @@
//#define CATCH_CONFIG_SFINAE // Not confirmed //#define CATCH_CONFIG_SFINAE // Not confirmed
#endif #endif
#if (_MSC_VER >= 1900 ) // (VC++ 2015)
#define CATCH_CONFIG_CPP11_NULLPTR
#endif
#endif // _MSC_VER #endif // _MSC_VER
// Use variadic macros if the compiler supports them // Use variadic macros if the compiler supports them
@ -157,7 +161,8 @@
// C++ language feature support // C++ language feature support
// detect language version: // detect language version:
#if (__cplusplus == 201103L) #if (__cplusplus == 201103L) || \
(defined(_MSC_VER) && _MSC_VER >= 1900)
# define CATCH_CPP11 # define CATCH_CPP11
# define CATCH_CPP11_OR_GREATER # define CATCH_CPP11_OR_GREATER
#elif (__cplusplus >= 201103L) #elif (__cplusplus >= 201103L)
@ -5253,7 +5258,7 @@ namespace Catch {
Totals totals; Totals totals;
context.testGroupStarting( "", 1, 1 ); // deprecated? context.testGroupStarting( "all tests", 1, 1 ); // deprecated?
TestSpec testSpec = m_config->testSpec(); TestSpec testSpec = m_config->testSpec();
if( !testSpec.hasFilters() ) if( !testSpec.hasFilters() )
@ -5276,7 +5281,7 @@ namespace Catch {
m_testsAlreadyRun.insert( *it ); m_testsAlreadyRun.insert( *it );
} }
} }
context.testGroupEnded( "", totals, 1, 1 ); context.testGroupEnded( "all tests", totals, 1, 1 );
return totals; return totals;
} }
@ -6417,7 +6422,7 @@ namespace Catch {
namespace Catch { namespace Catch {
// These numbers are maintained by a script // These numbers are maintained by a script
Version libraryVersion( 1, 0, 53, "master" ); Version libraryVersion( 1, 0, 55, "master" );
} }
// #included from: catch_message.hpp // #included from: catch_message.hpp