diff --git a/README b/README index 4f9d35de..be0d2fa0 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -CATCH v0.9 build 19 (integration branch) +CATCH v0.9 build 20 (integration branch) --------------------------------------------- CATCH is an automated test framework for C, C++ and Objective-C. diff --git a/include/internal/catch_console_colour_impl.hpp b/include/internal/catch_console_colour_impl.hpp index a274be47..340628d6 100644 --- a/include/internal/catch_console_colour_impl.hpp +++ b/include/internal/catch_console_colour_impl.hpp @@ -10,7 +10,7 @@ #include "catch_console_colour.hpp" -#if !defined( CATCH_CONFIG_NO_COLOUR ) +#if defined( CATCH_CONFIG_USE_ANSI_COLOUR_CODES ) #include diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index bc4611da..b272246c 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( 0, 9, 19, "integration" ); + Version libraryVersion( 0, 9, 20, "integration" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt index 058b47bb..96f71267 100644 --- a/projects/SelfTest/Baselines/approvedResults.txt +++ b/projects/SelfTest/Baselines/approvedResults.txt @@ -1,5 +1,5 @@ -CatchSelfTest is a CATCH v0.9 b18 (integration) host application. +CatchSelfTest is a CATCH v0.9 b19 (integration) host application. Run with -? for options ------------------------------------------------------------------------------- @@ -4279,7 +4279,7 @@ BDDTests.cpp:29: 99 test cases - 47 failed (616 assertions - 104 failed) -CatchSelfTest is a CATCH v0.9 b18 (integration) host application. +CatchSelfTest is a CATCH v0.9 b19 (integration) host application. Run with -? for options ------------------------------------------------------------------------------- diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 0df3c9b3..f0fa4193 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v0.9 build 19 (integration branch) - * Generated: 2013-02-19 19:46:31.030694 + * CATCH v0.9 build 20 (integration branch) + * Generated: 2013-02-19 19:57:51.967870 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -5352,7 +5352,7 @@ namespace Catch { } // end namespace Catch -#if !defined( CATCH_CONFIG_NO_COLOUR ) +#if defined( CATCH_CONFIG_USE_ANSI_COLOUR_CODES ) #include @@ -5838,7 +5838,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 0, 9, 19, "integration" ); + Version libraryVersion( 0, 9, 20, "integration" ); } // #included from: catch_line_wrap.hpp