diff options
| author | Martin Hořeňovský | 2020-08-08 18:18:27 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-08-10 20:30:40 +0200 |
| commit | 24b83edf8aca78c975c5589baf22a5de311498a7 (patch) | |
| tree | 5cd3db00515c33105d433f61fab46719d8c27d3c /src/catch2/internal/catch_commandline.cpp | |
| parent | b824d06844ab3faf4ddffa036a0ea7ef0eec117b (diff) | |
| download | catch3-24b83edf8aca78c975c5589baf22a5de311498a7.tar.gz | |
Clara cleanups
* Clara is now split between a header and a cpp file.
* Removed the deprecated `+` and `+=` operators for composing
a parser.
* Renamed `clara` and `detail` namespaces to be inline with the
rest of Catch2 (they are now `Clara` and `Detail` respectively).
* Taken most of user-exposed types out of the `Detail` namespace
completely (instead of using `using` directives to bring them into
the outer namespace).
Diffstat (limited to 'src/catch2/internal/catch_commandline.cpp')
| -rw-r--r-- | src/catch2/internal/catch_commandline.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/catch2/internal/catch_commandline.cpp b/src/catch2/internal/catch_commandline.cpp index 0f24fc95..43428813 100644 --- a/src/catch2/internal/catch_commandline.cpp +++ b/src/catch2/internal/catch_commandline.cpp @@ -19,9 +19,9 @@ namespace Catch { - clara::Parser makeCommandLineParser( ConfigData& config ) { + Clara::Parser makeCommandLineParser( ConfigData& config ) { - using namespace clara; + using namespace Clara; auto const setWarning = [&]( std::string const& warning ) { auto warningSet = [&]() { @@ -68,12 +68,12 @@ namespace Catch { else if( startsWith( "random", order ) ) config.runOrder = RunTests::InRandomOrder; else - return clara::ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" ); + return ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" ); return ParserResult::ok( ParseResultType::Matched ); }; auto const setRngSeed = [&]( std::string const& seed ) { if( seed != "time" ) - return clara::detail::convertInto( seed, config.rngSeed ); + return Clara::Detail::convertInto( seed, config.rngSeed ); config.rngSeed = static_cast<unsigned int>( std::time(nullptr) ); return ParserResult::ok( ParseResultType::Matched ); }; |