diff options
| author | Phil Nash | 2014-04-18 08:28:52 +0100 |
|---|---|---|
| committer | Phil Nash | 2014-04-18 08:28:52 +0100 |
| commit | 7303b2b60ef4b5bf01d7eda5da62beb243ce7a75 (patch) | |
| tree | fceb6d2c85716665b72eeac8b03fd2a268fb46e9 | |
| parent | cfc37b5fe9708d82cc9d1a3e3ed976ed8ae67f2d (diff) | |
| download | catch3-7303b2b60ef4b5bf01d7eda5da62beb243ce7a75.tar.gz | |
Changed branchName to char*, as per #266
| -rw-r--r-- | include/catch_runner.hpp | 2 | ||||
| -rw-r--r-- | include/internal/catch_version.h | 10 | ||||
| -rw-r--r-- | include/reporters/catch_reporter_console.hpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/catch_runner.hpp b/include/catch_runner.hpp index 97a65b2e..98f160a0 100644 --- a/include/catch_runner.hpp +++ b/include/catch_runner.hpp @@ -132,7 +132,7 @@ namespace Catch { std::cout << "\nCatch v" << libraryVersion.majorVersion << "." << libraryVersion.minorVersion << " build " << libraryVersion.buildNumber; - if( libraryVersion.branchName != "master" ) + if( libraryVersion.branchName != std::string( "master" ) ) std::cout << " (" << libraryVersion.branchName << " branch)"; std::cout << "\n"; diff --git a/include/internal/catch_version.h b/include/internal/catch_version.h index bca0f8bb..ca2feef3 100644 --- a/include/internal/catch_version.h +++ b/include/internal/catch_version.h @@ -15,17 +15,17 @@ namespace Catch { Version( unsigned int _majorVersion, unsigned int _minorVersion, unsigned int _buildNumber, - std::string const& _branchName ) + char const* const _branchName ) : majorVersion( _majorVersion ), minorVersion( _minorVersion ), buildNumber( _buildNumber ), branchName( _branchName ) {} - const unsigned int majorVersion; - const unsigned int minorVersion; - const unsigned int buildNumber; - const std::string branchName; + unsigned int const majorVersion; + unsigned int const minorVersion; + unsigned int const buildNumber; + char const* const branchName; private: void operator=( Version const& ); diff --git a/include/reporters/catch_reporter_console.hpp b/include/reporters/catch_reporter_console.hpp index 60ada648..71ca8905 100644 --- a/include/reporters/catch_reporter_console.hpp +++ b/include/reporters/catch_reporter_console.hpp @@ -262,7 +262,7 @@ namespace Catch { << " is a Catch v" << libraryVersion.majorVersion << "." << libraryVersion.minorVersion << " b" << libraryVersion.buildNumber; - if( libraryVersion.branchName != "master" ) + if( libraryVersion.branchName != std::string( "master" ) ) stream << " (" << libraryVersion.branchName << ")"; stream << " host application.\n" << "Run with -? for options\n\n"; |