mirror of https://github.com/QMCPACK/qmcpack.git
Catch2 2.3.10 patched
This commit is contained in:
parent
8392cc5d1d
commit
1785a45352
|
@ -3,7 +3,7 @@ C++ Unit test framework
|
|||
https://github.com/catchorg/Catch2
|
||||
|
||||
The single include file is downloaded from here:
|
||||
https://github.com/catchorg/Catch2/releases/download/v2.13.9/catch.hpp
|
||||
https://github.com/catchorg/Catch2/releases/download/v2.13.10/catch.hpp
|
||||
|
||||
This patch was applied to eliminate warnings from sprintf
|
||||
https://github.com/catchorg/Catch2/commit/0e2895934cf778f3bd7e84b3df10dac81d4ef7e3
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* Catch v2.13.9
|
||||
* Generated: 2022-04-12 22:37:23.260201
|
||||
* Catch v2.13.10
|
||||
* Generated: 2022-10-16 11:01:23.452308
|
||||
* ----------------------------------------------------------
|
||||
* This file has been merged from multiple headers. Please don't edit it directly
|
||||
* Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved.
|
||||
|
@ -15,7 +15,7 @@
|
|||
|
||||
#define CATCH_VERSION_MAJOR 2
|
||||
#define CATCH_VERSION_MINOR 13
|
||||
#define CATCH_VERSION_PATCH 9
|
||||
#define CATCH_VERSION_PATCH 10
|
||||
|
||||
#ifdef __clang__
|
||||
# pragma clang system_header
|
||||
|
@ -7399,8 +7399,6 @@ namespace Catch {
|
|||
template <typename T, bool Destruct>
|
||||
struct ObjectStorage
|
||||
{
|
||||
using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;
|
||||
|
||||
ObjectStorage() : data() {}
|
||||
|
||||
ObjectStorage(const ObjectStorage& other)
|
||||
|
@ -7443,7 +7441,7 @@ namespace Catch {
|
|||
return *static_cast<T*>(static_cast<void*>(&data));
|
||||
}
|
||||
|
||||
TStorage data;
|
||||
struct { alignas(T) unsigned char data[sizeof(T)]; } data;
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -7953,7 +7951,7 @@ namespace Catch {
|
|||
#if defined(__i386__) || defined(__x86_64__)
|
||||
#define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
|
||||
#elif defined(__aarch64__)
|
||||
#define CATCH_TRAP() __asm__(".inst 0xd4200000")
|
||||
#define CATCH_TRAP() __asm__(".inst 0xd43e0000")
|
||||
#endif
|
||||
|
||||
#elif defined(CATCH_PLATFORM_IPHONE)
|
||||
|
@ -13562,7 +13560,7 @@ namespace Catch {
|
|||
|
||||
// Handle list request
|
||||
if( Option<std::size_t> listed = list( m_config ) )
|
||||
return static_cast<int>( *listed );
|
||||
return (std::min) (MaxExitCode, static_cast<int>(*listed));
|
||||
|
||||
TestGroup tests { m_config };
|
||||
auto const totals = tests.execute();
|
||||
|
@ -15395,7 +15393,7 @@ namespace Catch {
|
|||
}
|
||||
|
||||
Version const& libraryVersion() {
|
||||
static Version version( 2, 13, 9, "", 0 );
|
||||
static Version version( 2, 13, 10, "", 0 );
|
||||
return version;
|
||||
}
|
||||
|
||||
|
@ -17532,12 +17530,20 @@ namespace Catch {
|
|||
|
||||
#ifndef __OBJC__
|
||||
|
||||
#ifndef CATCH_INTERNAL_CDECL
|
||||
#ifdef _MSC_VER
|
||||
#define CATCH_INTERNAL_CDECL __cdecl
|
||||
#else
|
||||
#define CATCH_INTERNAL_CDECL
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
|
||||
// Standard C/C++ Win32 Unicode wmain entry point
|
||||
extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
|
||||
extern "C" int CATCH_INTERNAL_CDECL wmain (int argc, wchar_t * argv[], wchar_t * []) {
|
||||
#else
|
||||
// Standard C/C++ main entry point
|
||||
int main (int argc, char * argv[]) {
|
||||
int CATCH_INTERNAL_CDECL main (int argc, char * argv[]) {
|
||||
#endif
|
||||
|
||||
return Catch::Session().run( argc, argv );
|
||||
|
|
Loading…
Reference in New Issue