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

Clara ignores anything after a lone — (double dash)

Browse Source 
- this allows use within an environment that appends additional arguments that Clara will otherwise reject
- generated build 23
This commit is contained in:
Phil Nash 2013-12-23 10:24:06 +00:00
parent 91ef5f7d40
commit e45e3a139a
4 changed files with 9 additions and 7 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 22 (master branch)* *v1.0 build 23 (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)

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

3
include/internal/clara.h
View File

@ -206,7 +206,8 @@ namespace Clara {
}; };
void parseIntoTokens( int argc, char const * const * argv, std::vector<Parser::Token>& tokens ) const { void parseIntoTokens( int argc, char const * const * argv, std::vector<Parser::Token>& tokens ) const {
for( int i = 1; i < argc; ++i ) const std::string doubleDash = "--";
for( int i = 1; i < argc && argv[i] != doubleDash; ++i )
parseIntoTokens( argv[i] , tokens); parseIntoTokens( argv[i] , tokens);
} }
void parseIntoTokens( std::string arg, std::vector<Parser::Token>& tokens ) const { void parseIntoTokens( std::string arg, std::vector<Parser::Token>& tokens ) const {

9
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* CATCH v1.0 build 22 (master branch) * CATCH v1.0 build 23 (master branch)
* Generated: 2013-12-20 19:06:10.591489 * Generated: 2013-12-23 10:22:45.547645
* ---------------------------------------------------------- * ----------------------------------------------------------
* 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.
@ -3224,7 +3224,8 @@ namespace Clara {
}; };
void parseIntoTokens( int argc, char const * const * argv, std::vector<Parser::Token>& tokens ) const { void parseIntoTokens( int argc, char const * const * argv, std::vector<Parser::Token>& tokens ) const {
for( int i = 1; i < argc; ++i ) const std::string doubleDash = "--";
for( int i = 1; i < argc && argv[i] != doubleDash; ++i )
parseIntoTokens( argv[i] , tokens); parseIntoTokens( argv[i] , tokens);
} }
void parseIntoTokens( std::string arg, std::vector<Parser::Token>& tokens ) const { void parseIntoTokens( std::string arg, std::vector<Parser::Token>& tokens ) const {
@ -6178,7 +6179,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, 22, "master" ); Version libraryVersion( 1, 0, 23, "master" );
} }
// #included from: catch_text.hpp // #included from: catch_text.hpp