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

use inline 'libraryVersion()' function (closes #858)

Browse Source
This commit is contained in:
Kevin Ushey 2017-03-16 11:17:45 -07:00 committed by Martin Hořeňovský
parent cffb031ce1
commit e04dc5105b
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/catch_session.hpp
View File

@ -125,7 +125,7 @@ namespace Catch {
} }
void showHelp( std::string const& processName ) { void showHelp( std::string const& processName ) {
Catch::cout() << "\nCatch v" << libraryVersion << "\n"; Catch::cout() << "\nCatch v" << libraryVersion() << "\n";
m_cli.usage( Catch::cout(), processName ); m_cli.usage( Catch::cout(), processName );
Catch::cout() << "For more detail usage please see the project docs\n" << std::endl; Catch::cout() << "For more detail usage please see the project docs\n" << std::endl;

2
include/internal/catch_version.h
View File

@ -32,7 +32,7 @@ namespace Catch {
void operator=( Version const& ); void operator=( Version const& );
}; };
extern Version libraryVersion; inline Version libraryVersion();
} }
#endif // TWOBLUECUBES_CATCH_VERSION_H_INCLUDED #endif // TWOBLUECUBES_CATCH_VERSION_H_INCLUDED

5
include/internal/catch_version.hpp
View File

@ -37,7 +37,10 @@ namespace Catch {
return os; return os;
} }
Version libraryVersion( 1, 8, 2, "", 0 ); inline Version libraryVersion() {
static Version version(1, 8, 2, "", 0);
return version;
}
} }

2
include/reporters/catch_reporter_console.hpp
View File

@ -254,7 +254,7 @@ namespace Catch {
stream << '\n' << getLineOfChars<'~'>() << '\n'; stream << '\n' << getLineOfChars<'~'>() << '\n';
Colour colour( Colour::SecondaryText ); Colour colour( Colour::SecondaryText );
stream << currentTestRunInfo->name stream << currentTestRunInfo->name
<< " is a Catch v" << libraryVersion << " host application.\n" << " is a Catch v" << libraryVersion() << " host application.\n"
<< "Run with -? for options\n\n"; << "Run with -? for options\n\n";
if( m_config->rngSeed() != 0 ) if( m_config->rngSeed() != 0 )

2
scripts/releaseCommon.py
View File

@ -7,7 +7,7 @@ import string
from scriptCommon import catchPath from scriptCommon import catchPath
versionParser = re.compile( r'(\s*Version\slibraryVersion)\s*\(\s*(.*)\s*,\s*(.*)\s*,\s*(.*)\s*,\s*\"(.*)\"\s*,\s*(.*)\s*\).*' ) versionParser = re.compile( r'(\s*static\sVersion\sversion)\s*\(\s*(.*)\s*,\s*(.*)\s*,\s*(.*)\s*,\s*\"(.*)\"\s*,\s*(.*)\s*\).*' )
rootPath = os.path.join( catchPath, 'include/' ) rootPath = os.path.join( catchPath, 'include/' )
versionPath = os.path.join( rootPath, "internal/catch_version.hpp" ) versionPath = os.path.join( rootPath, "internal/catch_version.hpp" )
readmePath = os.path.join( catchPath, "README.md" ) readmePath = os.path.join( catchPath, "README.md" )