diff options
| author | Martin Hořeňovský | 2018-05-14 15:15:28 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2018-05-14 15:15:28 +0200 |
| commit | 6860c8def0ba7559bf077515b7a7ff63ad3444f8 (patch) | |
| tree | e60f915c9952b6575563a2ebc801838f0a9122be | |
| parent | 3255ee6312030db754707ca9ccc44f3d563583c8 (diff) | |
| download | catch3-1.12.2.tar.gz | |
v1.12.2v1.12.2
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | conanfile.py | 2 | ||||
| -rw-r--r-- | docs/release-notes.md | 4 | ||||
| -rw-r--r-- | include/internal/catch_version.hpp | 2 | ||||
| -rw-r--r-- | single_include/catch.hpp | 10 | ||||
| -rw-r--r-- | test_package/conanfile.py | 2 |
6 files changed, 16 insertions, 8 deletions
@@ -3,9 +3,9 @@ [](https://github.com/philsquared/catch/releases) [](https://travis-ci.org/philsquared/Catch) [](https://ci.appveyor.com/project/philsquared/catch/branch/master) -[](https://wandbox.org/permlink/q3wLegtaHunTHSls) +[](https://wandbox.org/permlink/jG7wnHX9VAcxpSHy) -<a href="https://github.com/philsquared/Catch/releases/download/v1.12.1/catch.hpp">The latest, single header, version can be downloaded directly using this link</a> +<a href="https://github.com/philsquared/Catch/releases/download/v1.12.2/catch.hpp">The latest, single header, version can be downloaded directly using this link</a> ## What's the Catch? diff --git a/conanfile.py b/conanfile.py index b501ca9f..d5072afc 100644 --- a/conanfile.py +++ b/conanfile.py @@ -4,7 +4,7 @@ from conans import ConanFile class CatchConan(ConanFile): name = "Catch" - version = "1.12.1" + version = "1.12.2" description = "A modern, C++-native, header-only, framework for unit-tests, TDD and BDD" author = "philsquared" generators = "cmake" diff --git a/docs/release-notes.md b/docs/release-notes.md index f3c185ea..62779e1e 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,3 +1,7 @@ +# 1.12.2 +### Fixes +* Fixed missing <cassert> include + # 1.12.1 ### Fixes diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index 0cd0bed8..34fc757c 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -38,7 +38,7 @@ namespace Catch { } inline Version libraryVersion() { - static Version version( 1, 12, 1, "", 0 ); + static Version version( 1, 12, 2, "", 0 ); return version; } diff --git a/single_include/catch.hpp b/single_include/catch.hpp index f619f237..fdb046fe 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * Catch v1.12.1 - * Generated: 2018-03-02 21:17:41.036711 + * Catch v1.12.2 + * Generated: 2018-05-14 15:10:01.112442 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -6599,6 +6599,7 @@ namespace Catch { #endif // not Windows +#include <cassert> #include <set> #include <string> @@ -8466,7 +8467,7 @@ namespace Catch { } inline Version libraryVersion() { - static Version version( 1, 12, 1, "", 0 ); + static Version version( 1, 12, 2, "", 0 ); return version; } @@ -9171,6 +9172,8 @@ std::string toString( std::nullptr_t ) { // #included from: catch_result_builder.hpp #define TWOBLUECUBES_CATCH_RESULT_BUILDER_HPP_INCLUDED +#include <cassert> + namespace Catch { ResultBuilder::ResultBuilder( char const* macroName, @@ -10664,6 +10667,7 @@ namespace Catch { // #included from: ../reporters/catch_reporter_console.hpp #define TWOBLUECUBES_CATCH_REPORTER_CONSOLE_HPP_INCLUDED +#include <cassert> #include <cfloat> #include <cstdio> diff --git a/test_package/conanfile.py b/test_package/conanfile.py index 3835c926..f1b8cf83 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -10,7 +10,7 @@ class CatchConanTest(ConanFile): settings = "os", "compiler", "arch", "build_type" username = getenv("CONAN_USERNAME", "philsquared") channel = getenv("CONAN_CHANNEL", "testing") - requires = "Catch/1.12.1@%s/%s" % (username, channel) + requires = "Catch/1.12.2@%s/%s" % (username, channel) def build(self): cmake = CMake(self) |