mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 13:26:10 +01:00
Fixes toString forward reference issue:
- as raised in https://github.com/philsquared/Catch/pull/195
This commit is contained in:
parent
f7378eebb6
commit
1e2f1d1603
@ -1,6 +1,6 @@
|
||||
![catch logo](catch-logo-small.png)
|
||||
|
||||
*v1.0 build 9 (master branch)*
|
||||
*v1.0 build 10 (master branch)*
|
||||
|
||||
# New release with significant changes
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
#ifndef TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
|
||||
#define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
|
||||
|
||||
#include "catch_capture.hpp"
|
||||
#include "catch_tostring.hpp"
|
||||
|
||||
#include <cmath>
|
||||
#include <limits>
|
||||
|
@ -15,6 +15,7 @@
|
||||
#include "catch_debugger.hpp"
|
||||
#include "catch_context.h"
|
||||
#include "catch_common.h"
|
||||
#include "catch_tostring.hpp"
|
||||
#include "catch_interfaces_registry_hub.h"
|
||||
#include "internal/catch_compiler_capabilities.h"
|
||||
|
||||
|
@ -9,6 +9,7 @@
|
||||
#define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
|
||||
|
||||
#include "catch_interfaces_exception.h"
|
||||
#include "catch_tostring.hpp"
|
||||
|
||||
#ifdef __OBJC__
|
||||
#import "Foundation/Foundation.h"
|
||||
|
@ -10,6 +10,7 @@
|
||||
|
||||
#include "catch_expressionresult_builder.h"
|
||||
#include "catch_evaluate.hpp"
|
||||
#include "catch_tostring.hpp"
|
||||
|
||||
namespace Catch {
|
||||
|
||||
|
@ -80,6 +80,9 @@ namespace Detail {
|
||||
|
||||
} // end namespace Detail
|
||||
|
||||
template<typename T>
|
||||
std::string toString( T const& value );
|
||||
|
||||
template<typename T>
|
||||
struct StringMaker :
|
||||
Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {};
|
||||
|
@ -13,7 +13,7 @@
|
||||
namespace Catch {
|
||||
|
||||
// These numbers are maintained by a script
|
||||
Version libraryVersion( 1, 0, 9, "master" );
|
||||
Version libraryVersion( 1, 0, 10, "master" );
|
||||
}
|
||||
|
||||
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
|
||||
|
@ -8,7 +8,7 @@
|
||||
#ifndef TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED
|
||||
#define TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED
|
||||
|
||||
#include "../internal/catch_capture.hpp"
|
||||
#include "../internal/catch_tostring.hpp"
|
||||
#include "../internal/catch_interfaces_reporter.h"
|
||||
#include "../internal/catch_reporter_registrars.hpp"
|
||||
#include "../internal/catch_xmlwriter.hpp"
|
||||
|
@ -1,6 +1,6 @@
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
CatchSelfTest is a Catch v1.0 b9 host application.
|
||||
CatchSelfTest is a Catch v1.0 b10 host application.
|
||||
Run with -? for options
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
@ -712,7 +712,7 @@ with expansion:
|
||||
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
CatchSelfTest is a Catch v1.0 b9 host application.
|
||||
CatchSelfTest is a Catch v1.0 b10 host application.
|
||||
Run with -? for options
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
* CATCH v1.0 build 9 (master branch)
|
||||
* Generated: 2013-09-07 12:04:25.989589
|
||||
* CATCH v1.0 build 10 (master branch)
|
||||
* Generated: 2013-09-14 19:56:34.776409
|
||||
* ----------------------------------------------------------
|
||||
* This file has been merged from multiple headers. Please don't edit it directly
|
||||
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||
@ -703,6 +703,9 @@ namespace Detail {
|
||||
|
||||
} // end namespace Detail
|
||||
|
||||
template<typename T>
|
||||
std::string toString( T const& value );
|
||||
|
||||
template<typename T>
|
||||
struct StringMaker :
|
||||
Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {};
|
||||
@ -6352,7 +6355,7 @@ namespace Catch {
|
||||
namespace Catch {
|
||||
|
||||
// These numbers are maintained by a script
|
||||
Version libraryVersion( 1, 0, 9, "master" );
|
||||
Version libraryVersion( 1, 0, 10, "master" );
|
||||
}
|
||||
|
||||
// #included from: catch_text.hpp
|
||||
|
Loading…
Reference in New Issue
Block a user