mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-18 03:26:10 +01:00
08844e7e57
I've incremented the minor release number. This is a slight abuse of semantic versioning so let me explain: I've slightly changed how matchers are used. The matcher macro (REQUIRE_THAT/ CHECK_THAT) used to introduce the Catch::Matchers namespace before the macro token for the matcher, to save you having import the namespace yourself. The trouble is if the matcher token is not a simple matcher (can now be an expression) this breaks! So I've removed that qualification. Now if you use Matchers you'll have to do somethings like using namespace Catch::Matchers to bring them in. This is a breaking change - but, OTTOH, Matchers are an undocumented "beta' feature that I've stated in the past is not guaranteed to have a stable API - so I don't think this warrants a major version change - but I did want to make it significant enough that people do notice that something is going on - and perhaps lead them to this commit message.
45 lines
1.3 KiB
C++
45 lines
1.3 KiB
C++
/*
|
|
* Created by Phil on 14/11/2012.
|
|
* Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
|
|
*
|
|
* Distributed under the Boost Software License, Version 1.0. (See accompanying
|
|
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
|
*/
|
|
#ifndef TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
|
|
#define TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
|
|
|
|
#include "catch_version.h"
|
|
|
|
namespace Catch {
|
|
|
|
Version::Version
|
|
( unsigned int _majorVersion,
|
|
unsigned int _minorVersion,
|
|
unsigned int _patchNumber,
|
|
std::string const& _branchName,
|
|
unsigned int _buildNumber )
|
|
: majorVersion( _majorVersion ),
|
|
minorVersion( _minorVersion ),
|
|
patchNumber( _patchNumber ),
|
|
branchName( _branchName ),
|
|
buildNumber( _buildNumber )
|
|
{}
|
|
|
|
std::ostream& operator << ( std::ostream& os, Version const& version ) {
|
|
os << version.majorVersion << "."
|
|
<< version.minorVersion << "."
|
|
<< version.patchNumber;
|
|
|
|
if( !version.branchName.empty() ) {
|
|
os << "-" << version.branchName
|
|
<< "." << version.buildNumber;
|
|
}
|
|
return os;
|
|
}
|
|
|
|
Version libraryVersion( 1, 3, 0, "develop", 1 );
|
|
|
|
}
|
|
|
|
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
|