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

Changed branchName to char*, as per #266

Browse Source
This commit is contained in:
Phil Nash 2014-04-18 08:28:52 +01:00
parent cfc37b5fe9
commit 7303b2b60e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/catch_runner.hpp
View File

@ -132,7 +132,7 @@ namespace Catch {
std::cout << "\nCatch v" << libraryVersion.majorVersion << "." std::cout << "\nCatch v" << libraryVersion.majorVersion << "."
<< libraryVersion.minorVersion << " build " << libraryVersion.minorVersion << " build "
<< libraryVersion.buildNumber; << libraryVersion.buildNumber;
if( libraryVersion.branchName != "master" ) if( libraryVersion.branchName != std::string( "master" ) )
std::cout << " (" << libraryVersion.branchName << " branch)"; std::cout << " (" << libraryVersion.branchName << " branch)";
std::cout << "\n"; std::cout << "\n";

10
include/internal/catch_version.h
View File

@ -15,17 +15,17 @@ namespace Catch {
Version( unsigned int _majorVersion, Version( unsigned int _majorVersion,
unsigned int _minorVersion, unsigned int _minorVersion,
unsigned int _buildNumber, unsigned int _buildNumber,
std::string const& _branchName ) char const* const _branchName )
: majorVersion( _majorVersion ), : majorVersion( _majorVersion ),
minorVersion( _minorVersion ), minorVersion( _minorVersion ),
buildNumber( _buildNumber ), buildNumber( _buildNumber ),
branchName( _branchName ) branchName( _branchName )
{} {}
const unsigned int majorVersion; unsigned int const majorVersion;
const unsigned int minorVersion; unsigned int const minorVersion;
const unsigned int buildNumber; unsigned int const buildNumber;
const std::string branchName; char const* const branchName;
private: private:
void operator=( Version const& ); void operator=( Version const& );

2
include/reporters/catch_reporter_console.hpp
View File

@ -262,7 +262,7 @@ namespace Catch {
<< " is a Catch v" << libraryVersion.majorVersion << "." << " is a Catch v" << libraryVersion.majorVersion << "."
<< libraryVersion.minorVersion << " b" << libraryVersion.minorVersion << " b"
<< libraryVersion.buildNumber; << libraryVersion.buildNumber;
if( libraryVersion.branchName != "master" ) if( libraryVersion.branchName != std::string( "master" ) )
stream << " (" << libraryVersion.branchName << ")"; stream << " (" << libraryVersion.branchName << ")";
stream << " host application.\n" stream << " host application.\n"
<< "Run with -? for options\n\n"; << "Run with -? for options\n\n";