diff options
| author | Martin Hořeňovský | 2025-01-06 00:41:45 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2025-01-06 00:41:45 +0100 |
| commit | 914aeecfe23b1e16af6ea675a4fb5dbd5a5b8d0a (patch) | |
| tree | 1395cc6b7da5cc1b2b0eb63d48cdd7d4f6ec0ae3 /extras/catch_amalgamated.cpp | |
| parent | 232e893785553796b2016b4440a7f3776ed450a0 (diff) | |
| download | catch3-3.8.0.tar.gz | |
v3.8.0v3.8.0
Diffstat (limited to 'extras/catch_amalgamated.cpp')
| -rw-r--r-- | extras/catch_amalgamated.cpp | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index f45c18a0..5b9d7384 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -6,8 +6,8 @@ // SPDX-License-Identifier: BSL-1.0 -// Catch v3.7.1 -// Generated: 2024-09-17 10:36:45.608896 +// Catch v3.8.0 +// Generated: 2025-01-06 00:39:54.679994 // ---------------------------------------------------------- // This file is an amalgamation of multiple different files. // You probably shouldn't edit it directly. @@ -332,7 +332,7 @@ namespace Catch { double diff = b - m; return a + diff * diff; } ) / - ( last - first ); + static_cast<double>( last - first ); return std::sqrt( variance ); } @@ -367,7 +367,7 @@ namespace Catch { double* first, double* last ) { auto count = last - first; - double idx = (count - 1) * k / static_cast<double>(q); + double idx = static_cast<double>((count - 1) * k) / static_cast<double>(q); int j = static_cast<int>(idx); double g = idx - j; std::nth_element(first, first + j, last); @@ -470,10 +470,10 @@ namespace Catch { double accel = sum_cubes / ( 6 * std::pow( sum_squares, 1.5 ) ); long n = static_cast<long>( resample.size() ); - double prob_n = + double prob_n = static_cast<double>( std::count_if( resample.begin(), resample.end(), - [point]( double x ) { return x < point; } ) / + [point]( double x ) { return x < point; } )) / static_cast<double>( n ); // degenerate case with uniform samples if ( Catch::Detail::directCompare( prob_n, 0. ) ) { @@ -1926,7 +1926,7 @@ namespace Catch { return static_cast<unsigned int>(getElapsedMicroseconds()/1000); } auto Timer::getElapsedSeconds() const -> double { - return getElapsedMicroseconds()/1000000.0; + return static_cast<double>(getElapsedMicroseconds())/1000000.0; } @@ -1946,7 +1946,10 @@ namespace Detail { const int hexThreshold = 255; struct Endianness { - enum Arch { Big, Little }; + enum Arch : uint8_t { + Big, + Little + }; static Arch which() { int one = 1; @@ -2280,7 +2283,7 @@ namespace Catch { } Version const& libraryVersion() { - static Version version( 3, 7, 1, "", 0 ); + static Version version( 3, 8, 0, "", 0 ); return version; } @@ -3516,7 +3519,7 @@ namespace { #endif // Windows/ ANSI/ None -#if defined( CATCH_PLATFORM_LINUX ) || defined( CATCH_PLATFORM_MAC ) +#if defined( CATCH_PLATFORM_LINUX ) || defined( CATCH_PLATFORM_MAC ) || defined( __GLIBC__ ) # define CATCH_INTERNAL_HAS_ISATTY # include <unistd.h> #endif @@ -5258,7 +5261,7 @@ namespace { SimplePcg32::result_type SimplePcg32::operator()() { // prepare the output value const uint32_t xorshifted = static_cast<uint32_t>(((m_state >> 18u) ^ m_state) >> 27u); - const auto output = rotate_right(xorshifted, m_state >> 59u); + const auto output = rotate_right(xorshifted, static_cast<uint32_t>(m_state >> 59u)); // advance state m_state = m_state * 6364136223846793005ULL + s_inc; @@ -9108,7 +9111,7 @@ struct RowBreak {}; struct OutputFlush {}; class Duration { - enum class Unit { + enum class Unit : uint8_t { Auto, Nanoseconds, Microseconds, @@ -9180,7 +9183,10 @@ public: }; } // end anon namespace -enum class Justification { Left, Right }; +enum class Justification : uint8_t { + Left, + Right +}; struct ColumnInfo { std::string name; |