Skip to content

Commit fd9f5ac

Browse files
horenmarhorenmar
committed
v2.13.1
1 parent f0dc4d9 commit fd9f5ac

File tree

6 files changed

+35
-18
lines changed

6 files changed

+35
-18
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
1414
endif()
1515

1616

17-
project(Catch2 LANGUAGES CXX VERSION 2.13.0)
17+
project(Catch2 LANGUAGES CXX VERSION 2.13.1)
1818

1919
# Provide path for scripts
2020
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
[![Build Status](https://travis-ci.org/catchorg/Catch2.svg?branch=master)](https://travis-ci.org/catchorg/Catch2)
66
[![Build status](https://ci.appveyor.com/api/projects/status/github/catchorg/Catch2?svg=true)](https://ci.appveyor.com/project/catchorg/catch2)
77
[![codecov](https://codecov.io/gh/catchorg/Catch2/branch/master/graph/badge.svg)](https://codecov.io/gh/catchorg/Catch2)
8-
[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/aavJBzemrxUgGV9S)
8+
[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/6JUH8Eybx4CtvkJS)
99
[![Join the chat in Discord: https://discord.gg/4CWS9zD](https://img.shields.io/badge/Discord-Chat!-brightgreen.svg)](https://discord.gg/4CWS9zD)
1010

1111

12-
<a href="https://github.com/catchorg/Catch2/releases/download/v2.13.0/catch.hpp">The latest version of the single header can be downloaded directly using this link</a>
12+
<a href="https://github.com/catchorg/Catch2/releases/download/v2.13.1/catch.hpp">The latest version of the single header can be downloaded directly using this link</a>
1313

1414
## Catch2 is released!
1515

‎docs/release-notes.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# Release notes
44
**Contents**<br>
5+
[2.13.1](#2131)<br>
56
[2.13.0](#2130)<br>
67
[2.12.4](#2124)<br>
78
[2.12.3](#2123)<br>
@@ -40,6 +41,19 @@
4041
[Older versions](#older-versions)<br>
4142
[Even Older versions](#even-older-versions)<br>
4243

44+
45+
## 2.13.1
46+
47+
### Improvements
48+
* `ParseAndAddCatchTests` handles CMake v3.18.0 correctly (#1984)
49+
* Improved autodetection of `std::byte` (#1992)
50+
* Simplified implementation of templated test cases (#2007)
51+
* This should have a tiny positive effect on its compilation throughput
52+
53+
### Fixes
54+
* Automatic stringification of ranges handles sentinel ranges properly (#2004)
55+
56+
4357
## 2.13.0
4458

4559
### Improvements

‎include/catch.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#define CATCH_VERSION_MAJOR 2
1313
#define CATCH_VERSION_MINOR 13
14-
#define CATCH_VERSION_PATCH 0
14+
#define CATCH_VERSION_PATCH 1
1515

1616
#ifdef __clang__
1717
# pragma clang system_header

‎include/internal/catch_version.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace Catch {
3737
}
3838

3939
Version const& libraryVersion() {
40-
static Version version( 2, 13, 0, "", 0 );
40+
static Version version( 2, 13, 1, "", 0 );
4141
return version;
4242
}
4343

‎single_include/catch2/catch.hpp

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Catch v2.13.0
3-
* Generated: 2020-07-12 20:07:49.015950
2+
* Catch v2.13.1
3+
* Generated: 2020-09-07 12:12:38.090364
44
* ----------------------------------------------------------
55
* This file has been merged from multiple headers. Please don't edit it directly
66
* Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved.
@@ -15,7 +15,7 @@
1515

1616
#define CATCH_VERSION_MAJOR 2
1717
#define CATCH_VERSION_MINOR 13
18-
#define CATCH_VERSION_PATCH 0
18+
#define CATCH_VERSION_PATCH 1
1919

2020
#ifdef __clang__
2121
# pragma clang system_header
@@ -330,7 +330,10 @@ namespace Catch {
330330

331331
// Check if byte is available and usable
332332
# if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
333-
# define CATCH_INTERNAL_CONFIG_CPP17_BYTE
333+
# include <cstddef>
334+
# if __cpp_lib_byte > 0
335+
# define CATCH_INTERNAL_CONFIG_CPP17_BYTE
336+
# endif
334337
# endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
335338

336339
// Check if variant is available and usable
@@ -1105,7 +1108,7 @@ struct AutoReg : NonCopyable {
11051108
int index = 0; \
11061109
constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
11071110
using expander = int[];\
1108-
(void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++, 0)... };/* NOLINT */ \
1111+
(void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
11091112
}\
11101113
};\
11111114
static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
@@ -1151,7 +1154,7 @@ struct AutoReg : NonCopyable {
11511154
constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
11521155
constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
11531156
constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
1154-
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++, 0)... };/* NOLINT */\
1157+
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */\
11551158
} \
11561159
}; \
11571160
static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
@@ -1195,7 +1198,7 @@ struct AutoReg : NonCopyable {
11951198
void reg_tests() { \
11961199
int index = 0; \
11971200
using expander = int[]; \
1198-
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++, 0)... };/* NOLINT */\
1201+
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */\
11991202
} \
12001203
};\
12011204
static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
@@ -1229,7 +1232,7 @@ struct AutoReg : NonCopyable {
12291232
int index = 0; \
12301233
constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
12311234
using expander = int[];\
1232-
(void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++, 0)... };/* NOLINT */ \
1235+
(void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
12331236
}\
12341237
};\
12351238
static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
@@ -1278,7 +1281,7 @@ struct AutoReg : NonCopyable {
12781281
constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
12791282
constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
12801283
constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
1281-
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++, 0)... };/* NOLINT */ \
1284+
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */ \
12821285
}\
12831286
};\
12841287
static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
@@ -1325,7 +1328,7 @@ struct AutoReg : NonCopyable {
13251328
void reg_tests(){\
13261329
int index = 0;\
13271330
using expander = int[];\
1328-
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++, 0)... };/* NOLINT */ \
1331+
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */ \
13291332
}\
13301333
};\
13311334
static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
@@ -1829,8 +1832,8 @@ namespace Catch {
18291832
#endif
18301833

18311834
namespace Detail {
1832-
template<typename InputIterator>
1833-
std::string rangeToString(InputIterator first, InputIterator last) {
1835+
template<typename InputIterator, typename Sentinel = InputIterator>
1836+
std::string rangeToString(InputIterator first, Sentinel last) {
18341837
ReusableStringStream rss;
18351838
rss << "{ ";
18361839
if (first != last) {
@@ -15238,7 +15241,7 @@ namespace Catch {
1523815241
}
1523915242

1524015243
Version const& libraryVersion() {
15241-
static Version version( 2, 13, 0, "", 0 );
15244+
static Version version( 2, 13, 1, "", 0 );
1524215245
return version;
1524315246
}
1524415247

0 commit comments

Comments
 (0)