diff --git a/README.md b/README.md index 03506b64..4b321812 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![catch logo](catch-logo-small.png) -*v1.0 build 18 (master branch)* +*v1.0 build 19 (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_compiler_capabilities.h b/include/internal/catch_compiler_capabilities.h index 0644f9c0..905d7317 100644 --- a/include/internal/catch_compiler_capabilities.h +++ b/include/internal/catch_compiler_capabilities.h @@ -11,7 +11,6 @@ // Much of the following code is based on Boost (1.53) #ifdef __clang__ -#define CATCH_CONFIG_CPP11_NULLPTR #if __has_feature(cxx_nullptr) diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index 1ce459cc..62ce4115 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, 18, "master" ); + Version libraryVersion( 1, 0, 19, "master" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt index 54d3ee6f..7ff5146f 100644 --- a/projects/SelfTest/Baselines/console.std.approved.txt +++ b/projects/SelfTest/Baselines/console.std.approved.txt @@ -750,5 +750,5 @@ with expansion: "first" == "second" =============================================================================== -122 test cases - 36 failed (675 assertions - 91 failed) +121 test cases - 36 failed (674 assertions - 91 failed) diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt index fac8f544..6d696ef3 100644 --- a/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/projects/SelfTest/Baselines/console.sw.approved.txt @@ -6367,18 +6367,6 @@ PASSED: with expansion: __null == 0 -------------------------------------------------------------------------------- -null_ptr -------------------------------------------------------------------------------- -TrickyTests.cpp: -............................................................................... - -TrickyTests.cpp:: -PASSED: - REQUIRE( ptr.get() == std::__1::__get_nullptr_t() ) -with expansion: - __null == nullptr - ------------------------------------------------------------------------------- X/level/0/a ------------------------------------------------------------------------------- @@ -7143,5 +7131,5 @@ with expansion: true =============================================================================== -122 test cases - 51 failed (694 assertions - 110 failed) +121 test cases - 51 failed (693 assertions - 110 failed) diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt index ee3d8013..675a7be1 100644 --- a/projects/SelfTest/Baselines/junit.sw.approved.txt +++ b/projects/SelfTest/Baselines/junit.sw.approved.txt @@ -1,5 +1,5 @@ - + @@ -514,7 +514,6 @@ TrickyTests.cpp: - diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt index 39f32771..65477307 100644 --- a/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -6650,17 +6650,6 @@ there" - - - - ptr.get() == std::__1::__get_nullptr_t() - - - __null == nullptr - - - - @@ -7413,7 +7402,7 @@ there" - + - + diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 7e5881ee..3fbd9eb4 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v1.0 build 18 (master branch) - * Generated: 2013-12-14 14:32:59.401645 + * CATCH v1.0 build 19 (master branch) + * Generated: 2013-12-14 22:52:16.692380 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -44,7 +44,6 @@ // Much of the following code is based on Boost (1.53) #ifdef __clang__ -#define CATCH_CONFIG_CPP11_NULLPTR #if __has_feature(cxx_nullptr) @@ -6167,7 +6166,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 18, "master" ); + Version libraryVersion( 1, 0, 19, "master" ); } // #included from: catch_text.hpp