mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-26 23:36:11 +01:00
v2.12.1
--- Fixes --- * Vector matchers now support initializer list literals better --- Improvements --- * Added support for `^` (bitwise xor) to `CHECK` and `REQUIRE`
This commit is contained in:
parent
5c9f09e94a
commit
2e61d38c7c
@ -14,7 +14,7 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
project(Catch2 LANGUAGES CXX VERSION 2.12.0)
|
project(Catch2 LANGUAGES CXX VERSION 2.12.1)
|
||||||
|
|
||||||
# Provide path for scripts
|
# Provide path for scripts
|
||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")
|
||||||
|
@ -5,11 +5,11 @@
|
|||||||
[![Build Status](https://travis-ci.org/catchorg/Catch2.svg?branch=master)](https://travis-ci.org/catchorg/Catch2)
|
[![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)
|
[![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)
|
[![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)
|
[![Join the chat in Discord: https://discord.gg/4CWS9zD](https://img.shields.io/badge/Discord-Chat!-brightgreen.svg)](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!
|
## Catch2 is released!
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
# Release notes
|
# Release notes
|
||||||
**Contents**<br>
|
**Contents**<br>
|
||||||
|
[2.12.1](#2121)<br>
|
||||||
[2.12.0](#2120)<br>
|
[2.12.0](#2120)<br>
|
||||||
[2.11.3](#2113)<br>
|
[2.11.3](#2113)<br>
|
||||||
[2.11.2](#2112)<br>
|
[2.11.2](#2112)<br>
|
||||||
@ -35,6 +36,15 @@
|
|||||||
[Older versions](#older-versions)<br>
|
[Older versions](#older-versions)<br>
|
||||||
[Even Older versions](#even-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
|
## 2.12.0
|
||||||
|
|
||||||
### Improvements
|
### Improvements
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
#define CATCH_VERSION_MAJOR 2
|
#define CATCH_VERSION_MAJOR 2
|
||||||
#define CATCH_VERSION_MINOR 12
|
#define CATCH_VERSION_MINOR 12
|
||||||
#define CATCH_VERSION_PATCH 0
|
#define CATCH_VERSION_PATCH 1
|
||||||
|
|
||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
# pragma clang system_header
|
# pragma clang system_header
|
||||||
|
@ -37,7 +37,7 @@ namespace Catch {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Version const& libraryVersion() {
|
Version const& libraryVersion() {
|
||||||
static Version version( 2, 12, 0, "", 0 );
|
static Version version( 2, 12, 1, "", 0 );
|
||||||
return version;
|
return version;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Catch v2.12.0
|
* Catch v2.12.1
|
||||||
* Generated: 2020-04-21 16:27:54.138031
|
* Generated: 2020-04-21 19:29:20.964532
|
||||||
* ----------------------------------------------------------
|
* ----------------------------------------------------------
|
||||||
* This file has been merged from multiple headers. Please don't edit it directly
|
* This file has been merged from multiple headers. Please don't edit it directly
|
||||||
* Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved.
|
* Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved.
|
||||||
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
#define CATCH_VERSION_MAJOR 2
|
#define CATCH_VERSION_MAJOR 2
|
||||||
#define CATCH_VERSION_MINOR 12
|
#define CATCH_VERSION_MINOR 12
|
||||||
#define CATCH_VERSION_PATCH 0
|
#define CATCH_VERSION_PATCH 1
|
||||||
|
|
||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
# pragma clang system_header
|
# pragma clang system_header
|
||||||
@ -2377,6 +2377,10 @@ namespace Catch {
|
|||||||
auto operator & (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
|
auto operator & (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
|
||||||
return { static_cast<bool>(m_lhs & rhs), m_lhs, "&", rhs };
|
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>
|
template<typename RhsT>
|
||||||
auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
|
auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
|
||||||
@ -3730,7 +3734,7 @@ namespace Matchers {
|
|||||||
// The following functions create the actual matcher objects.
|
// The following functions create the actual matcher objects.
|
||||||
// This allows the types to be inferred
|
// 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 ) {
|
Vector::ContainsMatcher<T, AllocComp, AllocMatch> Contains( std::vector<T, AllocComp> const& comparator ) {
|
||||||
return Vector::ContainsMatcher<T, AllocComp, AllocMatch>( comparator );
|
return Vector::ContainsMatcher<T, AllocComp, AllocMatch>( comparator );
|
||||||
}
|
}
|
||||||
@ -3740,17 +3744,17 @@ namespace Matchers {
|
|||||||
return Vector::ContainsElementMatcher<T, Alloc>( comparator );
|
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 ) {
|
Vector::EqualsMatcher<T, AllocComp, AllocMatch> Equals( std::vector<T, AllocComp> const& comparator ) {
|
||||||
return Vector::EqualsMatcher<T, AllocComp, AllocMatch>( 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 ) {
|
Vector::ApproxMatcher<T, AllocComp, AllocMatch> Approx( std::vector<T, AllocComp> const& comparator ) {
|
||||||
return Vector::ApproxMatcher<T, AllocComp, AllocMatch>( 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) {
|
Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch> UnorderedEquals(std::vector<T, AllocComp> const& target) {
|
||||||
return Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch>( target );
|
return Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch>( target );
|
||||||
}
|
}
|
||||||
@ -15155,7 +15159,7 @@ namespace Catch {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Version const& libraryVersion() {
|
Version const& libraryVersion() {
|
||||||
static Version version( 2, 12, 0, "", 0 );
|
static Version version( 2, 12, 1, "", 0 );
|
||||||
return version;
|
return version;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user