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

Fixed instance of Clara::_ placeholder when using CATCH_CONFIG_RUNNER

Browse Source
This commit is contained in:
Phil Nash 2014-03-10 18:02:18 +00:00
parent dd2810d60a
commit f9df35b12b
4 changed files with 11 additions and 5 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 30 (master branch)* *v1.0 build 31 (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)

3
include/catch.hpp
View File

@ -19,6 +19,9 @@
#ifdef CATCH_CONFIG_MAIN #ifdef CATCH_CONFIG_MAIN
# define CATCH_CONFIG_RUNNER # define CATCH_CONFIG_RUNNER
#endif
#ifdef CATCH_CONFIG_RUNNER
# ifndef CLARA_CONFIG_MAIN # ifndef CLARA_CONFIG_MAIN
# define CLARA_CONFIG_MAIN_NOT_DEFINED # define CLARA_CONFIG_MAIN_NOT_DEFINED
# define CLARA_CONFIG_MAIN # define CLARA_CONFIG_MAIN

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, 30, "master" ); Version libraryVersion( 1, 0, 31, "master" );
} }
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

9
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* CATCH v1.0 build 30 (master branch) * CATCH v1.0 build 31 (master branch)
* Generated: 2014-03-07 06:56:50.010459 * Generated: 2014-03-10 18:01:22.986492
* ---------------------------------------------------------- * ----------------------------------------------------------
* 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.
@ -23,6 +23,9 @@
#ifdef CATCH_CONFIG_MAIN #ifdef CATCH_CONFIG_MAIN
# define CATCH_CONFIG_RUNNER # define CATCH_CONFIG_RUNNER
#endif
#ifdef CATCH_CONFIG_RUNNER
# ifndef CLARA_CONFIG_MAIN # ifndef CLARA_CONFIG_MAIN
# define CLARA_CONFIG_MAIN_NOT_DEFINED # define CLARA_CONFIG_MAIN_NOT_DEFINED
# define CLARA_CONFIG_MAIN # define CLARA_CONFIG_MAIN
@ -6588,7 +6591,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, 30, "master" ); Version libraryVersion( 1, 0, 31, "master" );
} }
// #included from: catch_message.hpp // #included from: catch_message.hpp