mirror of https://github.com/catchorg/Catch2.git
v1.9.5
This commit is contained in:
parent
b90d0b7267
commit
017a63da62
|
@ -4,7 +4,7 @@
|
||||||
[![Build Status](https://travis-ci.org/philsquared/Catch.svg?branch=master)](https://travis-ci.org/philsquared/Catch)
|
[![Build Status](https://travis-ci.org/philsquared/Catch.svg?branch=master)](https://travis-ci.org/philsquared/Catch)
|
||||||
[![Build status](https://ci.appveyor.com/api/projects/status/hrtk60hv6tw6fght/branch/master?svg=true)](https://ci.appveyor.com/project/philsquared/catch/branch/master)
|
[![Build status](https://ci.appveyor.com/api/projects/status/hrtk60hv6tw6fght/branch/master?svg=true)](https://ci.appveyor.com/project/philsquared/catch/branch/master)
|
||||||
|
|
||||||
<a href="https://github.com/philsquared/Catch/releases/download/v1.9.4/catch.hpp">The latest, single header, version can be downloaded directly using this link</a>
|
<a href="https://github.com/philsquared/Catch/releases/download/v1.9.5/catch.hpp">The latest, single header, version can be downloaded directly using this link</a>
|
||||||
|
|
||||||
## What's the Catch?
|
## What's the Catch?
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,19 @@
|
||||||
|
# 1.9.5
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
* Truthy expressions are now reconstructed properly, not as booleans (#914)
|
||||||
|
* Various warnings are no longer erroneously suppressed in test files (files that include `catch.hpp`, but do not define `CATCH_CONFIG_MAIN` or `CATCH_CONFIG_RUNNER`) (#871)
|
||||||
|
* Catch no longer fails to link when main is compiled as C++, but linked against Objective-C (#855)
|
||||||
|
* Fixed incorrect gcc version detection when deciding to use `__COUNTER__` (#928)
|
||||||
|
* Previously any GCC with minor version less than 3 would be incorrectly classified as not supporting `__COUNTER__`.
|
||||||
|
* Suppressed C4996 warning caused by upcoming updated to MSVC 2017, marking `std::uncaught_exception` as deprecated. (#927)
|
||||||
|
|
||||||
|
### Improvements
|
||||||
|
* CMake integration script now incorporates debug messages and registers tests in an improved way (#911)
|
||||||
|
* Various documentation improvements
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# 1.9.4
|
# 1.9.4
|
||||||
|
|
||||||
### Fixes
|
### Fixes
|
||||||
|
|
|
@ -38,7 +38,7 @@ namespace Catch {
|
||||||
}
|
}
|
||||||
|
|
||||||
inline Version libraryVersion() {
|
inline Version libraryVersion() {
|
||||||
static Version version( 1, 9, 4, "", 0 );
|
static Version version( 1, 9, 5, "", 0 );
|
||||||
return version;
|
return version;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Catch v1.9.4
|
* Catch v1.9.5
|
||||||
* Generated: 2017-05-16 13:51:55.506519
|
* Generated: 2017-06-15 12:03:23.301505
|
||||||
* ----------------------------------------------------------
|
* ----------------------------------------------------------
|
||||||
* This file has been merged from multiple headers. Please don't edit it directly
|
* This file has been merged from multiple headers. Please don't edit it directly
|
||||||
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||||
|
@ -220,7 +220,7 @@
|
||||||
|
|
||||||
// Use __COUNTER__ if the compiler supports it
|
// Use __COUNTER__ if the compiler supports it
|
||||||
#if ( defined _MSC_VER && _MSC_VER >= 1300 ) || \
|
#if ( defined _MSC_VER && _MSC_VER >= 1300 ) || \
|
||||||
( defined __GNUC__ && __GNUC__ >= 4 && __GNUC_MINOR__ >= 3 ) || \
|
( defined __GNUC__ && ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3 )) ) || \
|
||||||
( defined __clang__ && __clang_major__ >= 3 )
|
( defined __clang__ && __clang_major__ >= 3 )
|
||||||
|
|
||||||
#define CATCH_INTERNAL_CONFIG_COUNTER
|
#define CATCH_INTERNAL_CONFIG_COUNTER
|
||||||
|
@ -1571,7 +1571,7 @@ std::string toString( std::nullptr_t );
|
||||||
|
|
||||||
#ifdef __OBJC__
|
#ifdef __OBJC__
|
||||||
std::string toString( NSString const * const& nsstring );
|
std::string toString( NSString const * const& nsstring );
|
||||||
std::string toString( NSString * CATCH_ARC_STRONG const& nsstring );
|
std::string toString( NSString * CATCH_ARC_STRONG & nsstring );
|
||||||
std::string toString( NSObject* const& nsObject );
|
std::string toString( NSObject* const& nsObject );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1855,7 +1855,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE {
|
virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE {
|
||||||
dest = Catch::toString( m_truthy );
|
dest = Catch::toString( m_lhs );
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -8309,7 +8309,7 @@ namespace Catch {
|
||||||
}
|
}
|
||||||
|
|
||||||
inline Version libraryVersion() {
|
inline Version libraryVersion() {
|
||||||
static Version version( 1, 9, 4, "", 0 );
|
static Version version( 1, 9, 5, "", 0 );
|
||||||
return version;
|
return version;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8661,6 +8661,10 @@ namespace Catch {
|
||||||
m_timer.start();
|
m_timer.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(_MSC_VER)
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable:4996) // std::uncaught_exception is deprecated in C++17
|
||||||
|
#endif
|
||||||
Section::~Section() {
|
Section::~Section() {
|
||||||
if( m_sectionIncluded ) {
|
if( m_sectionIncluded ) {
|
||||||
SectionEndInfo endInfo( m_info, m_assertions, m_timer.getElapsedSeconds() );
|
SectionEndInfo endInfo( m_info, m_assertions, m_timer.getElapsedSeconds() );
|
||||||
|
@ -8670,6 +8674,9 @@ namespace Catch {
|
||||||
getResultCapture().sectionEnded( endInfo );
|
getResultCapture().sectionEnded( endInfo );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#if defined(_MSC_VER)
|
||||||
|
#pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
|
||||||
// This indicates whether the section should be executed or not
|
// This indicates whether the section should be executed or not
|
||||||
Section::operator bool() const {
|
Section::operator bool() const {
|
||||||
|
@ -8985,7 +8992,7 @@ std::string toString( std::nullptr_t ) {
|
||||||
return "nil";
|
return "nil";
|
||||||
return "@" + toString([nsstring UTF8String]);
|
return "@" + toString([nsstring UTF8String]);
|
||||||
}
|
}
|
||||||
std::string toString( NSString * CATCH_ARC_STRONG const& nsstring ) {
|
std::string toString( NSString * CATCH_ARC_STRONG & nsstring ) {
|
||||||
if( !nsstring )
|
if( !nsstring )
|
||||||
return "nil";
|
return "nil";
|
||||||
return "@" + toString([nsstring UTF8String]);
|
return "@" + toString([nsstring UTF8String]);
|
||||||
|
@ -10028,20 +10035,6 @@ namespace Catch {
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
// #included from: catch_reenable_warnings.h
|
|
||||||
|
|
||||||
#define TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED
|
|
||||||
|
|
||||||
#ifdef __clang__
|
|
||||||
# ifdef __ICC // icpc defines the __clang__ macro
|
|
||||||
# pragma warning(pop)
|
|
||||||
# else
|
|
||||||
# pragma clang diagnostic pop
|
|
||||||
# endif
|
|
||||||
#elif defined __GNUC__
|
|
||||||
# pragma GCC diagnostic pop
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
namespace Catch {
|
namespace Catch {
|
||||||
class XmlReporter : public StreamingReporterBase {
|
class XmlReporter : public StreamingReporterBase {
|
||||||
|
@ -11504,5 +11497,19 @@ int main (int argc, char * const argv[]) {
|
||||||
|
|
||||||
using Catch::Detail::Approx;
|
using Catch::Detail::Approx;
|
||||||
|
|
||||||
|
// #included from: internal/catch_reenable_warnings.h
|
||||||
|
|
||||||
|
#define TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED
|
||||||
|
|
||||||
|
#ifdef __clang__
|
||||||
|
# ifdef __ICC // icpc defines the __clang__ macro
|
||||||
|
# pragma warning(pop)
|
||||||
|
# else
|
||||||
|
# pragma clang diagnostic pop
|
||||||
|
# endif
|
||||||
|
#elif defined __GNUC__
|
||||||
|
# pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
|
#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue