diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4dd2b52..78ac4c8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
endif()
project(Catch2
- VERSION 3.5.1 # CML version placeholder, don't delete
+ VERSION 3.5.2 # CML version placeholder, don't delete
LANGUAGES CXX
# HOMEPAGE_URL is not supported until CMake version 3.12, which
# we do not target yet.
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 0449ed0e..ca7f4dde 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -2,6 +2,7 @@
# Release notes
**Contents**
+[3.5.2](#352)
[3.5.1](#351)
[3.5.0](#350)
[3.4.0](#340)
@@ -59,6 +60,13 @@
[Even Older versions](#even-older-versions)
+## 3.5.1
+
+### Fixes
+* Fixed `-Wsubobject-linkage` in the Console reporter (#2794)
+* Fixed adding new CLI Options to lvalue parser using `|` (#2787)
+
+
## 3.5.1
### Improvements
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp
index 30e2d9f2..f68c9005 100644
--- a/extras/catch_amalgamated.cpp
+++ b/extras/catch_amalgamated.cpp
@@ -6,8 +6,8 @@
// SPDX-License-Identifier: BSL-1.0
-// Catch v3.5.1
-// Generated: 2023-12-31 15:10:55.864983
+// Catch v3.5.2
+// Generated: 2024-01-15 14:06:36.675713
// ----------------------------------------------------------
// This file is an amalgamation of multiple different files.
// You probably shouldn't edit it directly.
@@ -187,21 +187,16 @@ namespace Catch {
double const* last,
Estimator& estimator ) {
auto n = static_cast( last - first );
- std::uniform_int_distribution dist( 0,
- n - 1 );
+ std::uniform_int_distribution dist( 0, n - 1 );
sample out;
out.reserve( resamples );
- // We allocate the vector outside the loop to avoid realloc
- // per resample
std::vector resampled;
resampled.reserve( n );
for ( size_t i = 0; i < resamples; ++i ) {
resampled.clear();
for ( size_t s = 0; s < n; ++s ) {
- resampled.push_back(
- first[static_cast(
- dist( rng ) )] );
+ resampled.push_back( first[dist( rng )] );
}
const auto estimate =
estimator( resampled.data(), resampled.data() + resampled.size() );
@@ -2273,7 +2268,7 @@ namespace Catch {
}
Version const& libraryVersion() {
- static Version version( 3, 5, 1, "", 0 );
+ static Version version( 3, 5, 2, "", 0 );
return version;
}
@@ -4380,7 +4375,6 @@ namespace Detail {
CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << '\'' );
m_ofs << std::unitbuf;
}
- ~FileStream() override = default;
public: // IStream
std::ostream& stream() override {
return m_ofs;
@@ -4395,7 +4389,6 @@ namespace Detail {
// Store the streambuf from cout up-front because
// cout may get redirected when running tests
CoutStream() : m_os( Catch::cout().rdbuf() ) {}
- ~CoutStream() override = default;
public: // IStream
std::ostream& stream() override { return m_os; }
@@ -4409,7 +4402,6 @@ namespace Detail {
// Store the streambuf from cerr up-front because
// cout may get redirected when running tests
CerrStream(): m_os( Catch::cerr().rdbuf() ) {}
- ~CerrStream() override = default;
public: // IStream
std::ostream& stream() override { return m_os; }
@@ -4427,8 +4419,6 @@ namespace Detail {
m_os( m_streamBuf.get() )
{}
- ~DebugOutStream() override = default;
-
public: // IStream
std::ostream& stream() override { return m_os; }
};
@@ -5441,7 +5431,6 @@ namespace Catch {
TrackerContext& ctx,
ITracker* parent ):
TrackerBase( CATCH_MOVE( nameAndLocation ), ctx, parent ) {}
- ~GeneratorTracker() override = default;
static GeneratorTracker*
acquire( TrackerContext& ctx,
@@ -8799,13 +8788,6 @@ findMax( std::size_t& i, std::size_t& j, std::size_t& k, std::size_t& l ) {
return l;
}
-enum class Justification { Left, Right };
-
-struct ColumnInfo {
- std::string name;
- std::size_t width;
- Justification justification;
-};
struct ColumnBreak {};
struct RowBreak {};
struct OutputFlush {};
@@ -8883,6 +8865,14 @@ public:
};
} // end anon namespace
+enum class Justification { Left, Right };
+
+struct ColumnInfo {
+ std::string name;
+ std::size_t width;
+ Justification justification;
+};
+
class TablePrinter {
std::ostream& m_os;
std::vector m_columnInfos;
diff --git a/extras/catch_amalgamated.hpp b/extras/catch_amalgamated.hpp
index 80279c1e..fdba759a 100644
--- a/extras/catch_amalgamated.hpp
+++ b/extras/catch_amalgamated.hpp
@@ -6,8 +6,8 @@
// SPDX-License-Identifier: BSL-1.0
-// Catch v3.5.1
-// Generated: 2023-12-31 15:10:53.044176
+// Catch v3.5.2
+// Generated: 2024-01-15 14:06:34.036475
// ----------------------------------------------------------
// This file is an amalgamation of multiple different files.
// You probably shouldn't edit it directly.
@@ -3766,7 +3766,7 @@ namespace Catch {
bool benchmarkNoAnalysis = false;
unsigned int benchmarkSamples = 100;
double benchmarkConfidenceInterval = 0.95;
- unsigned int benchmarkResamples = 100000;
+ unsigned int benchmarkResamples = 100'000;
std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
Verbosity verbosity = Verbosity::Normal;
@@ -4825,7 +4825,9 @@ namespace Catch {
template
friend Parser operator|( Parser const& p, T&& rhs ) {
- return Parser( p ) |= CATCH_FORWARD(rhs);
+ Parser temp( p );
+ temp |= rhs;
+ return temp;
}
template
@@ -7146,7 +7148,7 @@ namespace Catch {
#define CATCH_VERSION_MAJOR 3
#define CATCH_VERSION_MINOR 5
-#define CATCH_VERSION_PATCH 1
+#define CATCH_VERSION_PATCH 2
#endif // CATCH_VERSION_MACROS_HPP_INCLUDED
diff --git a/meson.build b/meson.build
index 75cb4183..0a897520 100644
--- a/meson.build
+++ b/meson.build
@@ -8,7 +8,7 @@
project(
'catch2',
'cpp',
- version: '3.5.1', # CML version placeholder, don't delete
+ version: '3.5.2', # CML version placeholder, don't delete
license: 'BSL-1.0',
meson_version: '>=0.54.1',
)
diff --git a/src/catch2/catch_version.cpp b/src/catch2/catch_version.cpp
index c56fb806..4e67d968 100644
--- a/src/catch2/catch_version.cpp
+++ b/src/catch2/catch_version.cpp
@@ -36,7 +36,7 @@ namespace Catch {
}
Version const& libraryVersion() {
- static Version version( 3, 5, 1, "", 0 );
+ static Version version( 3, 5, 2, "", 0 );
return version;
}
diff --git a/src/catch2/catch_version_macros.hpp b/src/catch2/catch_version_macros.hpp
index 6f41667c..be2a04d2 100644
--- a/src/catch2/catch_version_macros.hpp
+++ b/src/catch2/catch_version_macros.hpp
@@ -10,6 +10,6 @@
#define CATCH_VERSION_MAJOR 3
#define CATCH_VERSION_MINOR 5
-#define CATCH_VERSION_PATCH 1
+#define CATCH_VERSION_PATCH 2
#endif // CATCH_VERSION_MACROS_HPP_INCLUDED