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

Fixes toString forward reference issue:

Browse Source 
- as raised in https://github.com/philsquared/Catch/pull/195
This commit is contained in:
Phil Nash 2013-09-14 19:58:45 +01:00
parent f7378eebb6
commit 1e2f1d1603
10 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
![catch logo](catch-logo-small.png) ![catch logo](catch-logo-small.png)
*v1.0 build 9 (master branch)* *v1.0 build 10 (master branch)*
# New release with significant changes # New release with significant changes

2
include/internal/catch_approx.hpp
View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED #define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
#include "catch_capture.hpp" #include "catch_tostring.hpp"
#include <cmath> #include <cmath>
#include <limits> #include <limits>

1
include/internal/catch_capture.hpp
View File

@ -15,6 +15,7 @@
#include "catch_debugger.hpp" #include "catch_debugger.hpp"
#include "catch_context.h" #include "catch_context.h"
#include "catch_common.h" #include "catch_common.h"
#include "catch_tostring.hpp"
#include "catch_interfaces_registry_hub.h" #include "catch_interfaces_registry_hub.h"
#include "internal/catch_compiler_capabilities.h" #include "internal/catch_compiler_capabilities.h"

1
include/internal/catch_exception_translator_registry.hpp
View File

@ -9,6 +9,7 @@
#define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED #define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
#include "catch_interfaces_exception.h" #include "catch_interfaces_exception.h"
#include "catch_tostring.hpp"
#ifdef __OBJC__ #ifdef __OBJC__
#import "Foundation/Foundation.h" #import "Foundation/Foundation.h"

1
include/internal/catch_expression_lhs.hpp
View File

@ -10,6 +10,7 @@
#include "catch_expressionresult_builder.h" #include "catch_expressionresult_builder.h"
#include "catch_evaluate.hpp" #include "catch_evaluate.hpp"
#include "catch_tostring.hpp"
namespace Catch { namespace Catch {

3
include/internal/catch_tostring.hpp
View File

@ -80,6 +80,9 @@ namespace Detail {
} // end namespace Detail } // end namespace Detail
template<typename T>
std::string toString( T const& value );
template<typename T> template<typename T>
struct StringMaker : struct StringMaker :
Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {}; Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {};

2
include/internal/catch_version.hpp
View File

@ -13,7 +13,7 @@
namespace Catch { namespace Catch {
// These numbers are maintained by a script // 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 #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

2
include/reporters/catch_reporter_junit.hpp
View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED
#define 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_interfaces_reporter.h"
#include "../internal/catch_reporter_registrars.hpp" #include "../internal/catch_reporter_registrars.hpp"
#include "../internal/catch_xmlwriter.hpp" #include "../internal/catch_xmlwriter.hpp"

4
projects/SelfTest/Baselines/approvedResults.txt
View File

@ -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 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 Run with -? for options
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

9
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* CATCH v1.0 build 9 (master branch) * CATCH v1.0 build 10 (master branch)
* Generated: 2013-09-07 12:04:25.989589 * Generated: 2013-09-14 19:56:34.776409
* ---------------------------------------------------------- * ----------------------------------------------------------
* 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.
@ -703,6 +703,9 @@ namespace Detail {
} // end namespace Detail } // end namespace Detail
template<typename T>
std::string toString( T const& value );
template<typename T> template<typename T>
struct StringMaker : struct StringMaker :
Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {}; Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {};
@ -6352,7 +6355,7 @@ namespace Catch {
namespace Catch { namespace Catch {
// These numbers are maintained by a script // These numbers are maintained by a script
Version libraryVersion( 1, 0, 9, "master" ); Version libraryVersion( 1, 0, 10, "master" );
} }
// #included from: catch_text.hpp // #included from: catch_text.hpp