Version uses constructor instead of initialiser to avoid warnings

This commit is contained in:
Phil Nash
2012-12-01 23:42:47 +00:00
parent 602880f5ab
commit b56aaf4c36
4 changed files with 22 additions and 12 deletions

View File

@@ -12,10 +12,20 @@ namespace Catch {
// Versioning information
struct Version {
const unsigned int MajorVersion;
const unsigned int MinorVersion;
const unsigned int BuildNumber;
const std::string BranchName;
Version( unsigned int _majorVersion,
unsigned int _minorVersion,
unsigned int _buildNumber,
std::string 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;
};
extern Version libraryVersion;

View File

@@ -13,7 +13,7 @@
namespace Catch {
// These numbers are maintained by a script
Version libraryVersion = { 0, 9, 6, "integration" };
Version libraryVersion( 0, 9, 6, "integration" );
}
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED