diff --git a/README.md b/README.md index df823885..5ded1184 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![catch logo](catch-logo-small.png) -*v1.0 build 40 (master branch)* +*v1.0 build 41 (master branch)* Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch) diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index afa50b04..a1fee48a 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -13,7 +13,7 @@ namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 40, "master" ); + Version libraryVersion( 1, 0, 41, "master" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/single_include/catch.hpp b/single_include/catch.hpp index aa752e98..54df72bd 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v1.0 build 40 (master branch) - * Generated: 2014-04-23 07:07:39.268798 + * CATCH v1.0 build 41 (master branch) + * Generated: 2014-04-23 18:19:30.301111 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -56,11 +56,13 @@ #ifdef __clang__ -#if __has_feature(cxx_nullptr) +# if __has_feature(cxx_nullptr) +# define CATCH_CONFIG_CPP11_NULLPTR +# endif -#define CATCH_CONFIG_CPP11_NULLPTR - -#endif +# if __has_feature(cxx_noexcept) +# define CATCH_CONFIG_CPP11_NOEXCEPT +# endif #endif // __clang__ @@ -151,13 +153,10 @@ #endif // noexcept support: -#ifdef CATCH_CPP11_OR_GREATER -# if (__has_feature(cxx_noexcept)) -# define CATCH_NOEXCEPT noexcept -# define CATCH_NOEXCEPT_IS(x) noexcept(x) -# endif -#endif -#ifndef CATCH_NO_EXCEPT +#if defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_NOEXCEPT) +# define CATCH_NOEXCEPT noexcept +# define CATCH_NOEXCEPT_IS(x) noexcept(x) +#else # define CATCH_NOEXCEPT throw() # define CATCH_NOEXCEPT_IS(x) #endif @@ -617,6 +616,7 @@ namespace Catch { #include #include #include +#include #ifdef __OBJC__ // #included from: catch_objc_arc.hpp @@ -992,6 +992,8 @@ namespace Catch { #pragma warning(disable:4389) // '==' : signed/unsigned mismatch #endif +#include + namespace Catch { namespace Internal { @@ -6652,7 +6654,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 40, "master" ); + Version libraryVersion( 1, 0, 41, "master" ); } // #included from: catch_message.hpp @@ -7984,6 +7986,8 @@ namespace Catch { // #included from: ../reporters/catch_reporter_console.hpp #define TWOBLUECUBES_CATCH_REPORTER_CONSOLE_HPP_INCLUDED +#include + namespace Catch { struct ConsoleReporter : StreamingReporterBase {