diff options
| author | Martin Hořeňovský | 2020-04-21 19:30:38 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-04-21 19:30:38 +0200 |
| commit | 2e61d38c7c3078e600c331257b5bebfb81aaa685 (patch) | |
| tree | 9f718ccb75a1aa3e2aede050077ac3ff6cb832e0 | |
| parent | 5c9f09e94a32ab47f16bf8353a708e226fccf645 (diff) | |
| download | catch3-2.12.1.tar.gz | |
v2.12.1v2.12.1
--- Fixes ---
* Vector matchers now support initializer list literals better
--- Improvements ---
* Added support for `^` (bitwise xor) to `CHECK` and `REQUIRE`
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | docs/release-notes.md | 10 | ||||
| -rw-r--r-- | include/catch.hpp | 2 | ||||
| -rw-r--r-- | include/internal/catch_version.cpp | 2 | ||||
| -rw-r--r-- | single_include/catch2/catch.hpp | 20 |
6 files changed, 27 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 133cd297..8e8ee02d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) endif() -project(Catch2 LANGUAGES CXX VERSION 2.12.0) +project(Catch2 LANGUAGES CXX VERSION 2.12.1) # Provide path for scripts list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake") @@ -5,11 +5,11 @@ [](https://travis-ci.org/catchorg/Catch2) [](https://ci.appveyor.com/project/catchorg/catch2) [](https://codecov.io/gh/catchorg/Catch2) -[](https://wandbox.org/permlink/oT7SOoJ9ua6JsdEB) +[](https://wandbox.org/permlink/DQL97fLLJLZXwB8d) [](https://discord.gg/4CWS9zD) -<a href="https://github.com/catchorg/Catch2/releases/download/v2.12.0/catch.hpp">The latest version of the single header can be downloaded directly using this link</a> +<a href="https://github.com/catchorg/Catch2/releases/download/v2.12.1/catch.hpp">The latest version of the single header can be downloaded directly using this link</a> ## Catch2 is released! diff --git a/docs/release-notes.md b/docs/release-notes.md index c92b75f6..1567314d 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -2,6 +2,7 @@ # Release notes **Contents**<br> +[2.12.1](#2121)<br> [2.12.0](#2120)<br> [2.11.3](#2113)<br> [2.11.2](#2112)<br> @@ -35,6 +36,15 @@ [Older versions](#older-versions)<br> [Even Older versions](#even-older-versions)<br> +## 2.12.1 + +### Fixes +* Vector matchers now support initializer list literals better + +### Improvements +* Added support for `^` (bitwise xor) to `CHECK` and `REQUIRE` + + ## 2.12.0 ### Improvements diff --git a/include/catch.hpp b/include/catch.hpp index ca76e192..b8b79b94 100644 --- a/include/catch.hpp +++ b/include/catch.hpp @@ -11,7 +11,7 @@ #define CATCH_VERSION_MAJOR 2 #define CATCH_VERSION_MINOR 12 -#define CATCH_VERSION_PATCH 0 +#define CATCH_VERSION_PATCH 1 #ifdef __clang__ # pragma clang system_header diff --git a/include/internal/catch_version.cpp b/include/internal/catch_version.cpp index deec33e2..8f2daea7 100644 --- a/include/internal/catch_version.cpp +++ b/include/internal/catch_version.cpp @@ -37,7 +37,7 @@ namespace Catch { } Version const& libraryVersion() { - static Version version( 2, 12, 0, "", 0 ); + static Version version( 2, 12, 1, "", 0 ); return version; } diff --git a/single_include/catch2/catch.hpp b/single_include/catch2/catch.hpp index d27223f4..6beb0ead 100644 --- a/single_include/catch2/catch.hpp +++ b/single_include/catch2/catch.hpp @@ -1,6 +1,6 @@ /* - * Catch v2.12.0 - * Generated: 2020-04-21 16:27:54.138031 + * Catch v2.12.1 + * Generated: 2020-04-21 19:29:20.964532 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved. @@ -15,7 +15,7 @@ #define CATCH_VERSION_MAJOR 2 #define CATCH_VERSION_MINOR 12 -#define CATCH_VERSION_PATCH 0 +#define CATCH_VERSION_PATCH 1 #ifdef __clang__ # pragma clang system_header @@ -2377,6 +2377,10 @@ namespace Catch { auto operator & (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const { return { static_cast<bool>(m_lhs & rhs), m_lhs, "&", rhs }; } + template <typename RhsT> + auto operator ^ (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const { + return { static_cast<bool>(m_lhs ^ rhs), m_lhs, "^", rhs }; + } template<typename RhsT> auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const { @@ -3730,7 +3734,7 @@ namespace Matchers { // The following functions create the actual matcher objects. // This allows the types to be inferred - template<typename T, typename AllocComp, typename AllocMatch = AllocComp> + template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp> Vector::ContainsMatcher<T, AllocComp, AllocMatch> Contains( std::vector<T, AllocComp> const& comparator ) { return Vector::ContainsMatcher<T, AllocComp, AllocMatch>( comparator ); } @@ -3740,17 +3744,17 @@ namespace Matchers { return Vector::ContainsElementMatcher<T, Alloc>( comparator ); } - template<typename T, typename AllocComp, typename AllocMatch = AllocComp> + template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp> Vector::EqualsMatcher<T, AllocComp, AllocMatch> Equals( std::vector<T, AllocComp> const& comparator ) { return Vector::EqualsMatcher<T, AllocComp, AllocMatch>( comparator ); } - template<typename T, typename AllocComp, typename AllocMatch = AllocComp> + template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp> Vector::ApproxMatcher<T, AllocComp, AllocMatch> Approx( std::vector<T, AllocComp> const& comparator ) { return Vector::ApproxMatcher<T, AllocComp, AllocMatch>( comparator ); } - template<typename T, typename AllocComp, typename AllocMatch = AllocComp> + template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp> Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch> UnorderedEquals(std::vector<T, AllocComp> const& target) { return Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch>( target ); } @@ -15155,7 +15159,7 @@ namespace Catch { } Version const& libraryVersion() { - static Version version( 2, 12, 0, "", 0 ); + static Version version( 2, 12, 1, "", 0 ); return version; } |