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")
diff --git a/README.md b/README.md
index 0d0a695c..455b572e 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,11 @@
[![Build Status](https://travis-ci.org/catchorg/Catch2.svg?branch=master)](https://travis-ci.org/catchorg/Catch2)
[![Build status](https://ci.appveyor.com/api/projects/status/github/catchorg/Catch2?svg=true)](https://ci.appveyor.com/project/catchorg/catch2)
[![codecov](https://codecov.io/gh/catchorg/Catch2/branch/master/graph/badge.svg)](https://codecov.io/gh/catchorg/Catch2)
-[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/oT7SOoJ9ua6JsdEB)
+[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/DQL97fLLJLZXwB8d)
[![Join the chat in Discord: https://discord.gg/4CWS9zD](https://img.shields.io/badge/Discord-Chat!-brightgreen.svg)](https://discord.gg/4CWS9zD)
-The latest version of the single header can be downloaded directly using this link
+The latest version of the single header can be downloaded directly using this link
## 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**
+[2.12.1](#2121)
[2.12.0](#2120)
[2.11.3](#2113)
[2.11.2](#2112)
@@ -35,6 +36,15 @@
[Older versions](#older-versions)
[Even Older versions](#even-older-versions)
+## 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 const {
return { static_cast(m_lhs & rhs), m_lhs, "&", rhs };
}
+ template
+ auto operator ^ (RhsT const& rhs) -> BinaryExpr const {
+ return { static_cast(m_lhs ^ rhs), m_lhs, "^", rhs };
+ }
template
auto operator && ( RhsT const& ) -> BinaryExpr const {
@@ -3730,7 +3734,7 @@ namespace Matchers {
// The following functions create the actual matcher objects.
// This allows the types to be inferred
- template
+ template, typename AllocMatch = AllocComp>
Vector::ContainsMatcher Contains( std::vector const& comparator ) {
return Vector::ContainsMatcher( comparator );
}
@@ -3740,17 +3744,17 @@ namespace Matchers {
return Vector::ContainsElementMatcher( comparator );
}
- template
+ template, typename AllocMatch = AllocComp>
Vector::EqualsMatcher Equals( std::vector const& comparator ) {
return Vector::EqualsMatcher( comparator );
}
- template
+ template, typename AllocMatch = AllocComp>
Vector::ApproxMatcher Approx( std::vector const& comparator ) {
return Vector::ApproxMatcher( comparator );
}
- template
+ template, typename AllocMatch = AllocComp>
Vector::UnorderedEqualsMatcher UnorderedEquals(std::vector const& target) {
return Vector::UnorderedEqualsMatcher( 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;
}