diff --git a/premake/rythe b/premake/rythe index d280cd418..bebc9e3f8 160000 --- a/premake/rythe +++ b/premake/rythe @@ -1 +1 @@ -Subproject commit d280cd41853493cca23bc28c02cce6998ad5e399 +Subproject commit bebc9e3f8dc5bbd01153553de2ec31a51a5902c6 diff --git a/utils/test utils/main.cpp b/utils/test utils/main.cpp index 97a9e434a..c7a1e7e2b 100644 --- a/utils/test utils/main.cpp +++ b/utils/test utils/main.cpp @@ -1,43 +1 @@ - -// Copyright Catch2 Authors -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE.txt or copy at -// https://www.boost.org/LICENSE_1_0.txt) - -// SPDX-License-Identifier: BSL-1.0 -#include -#include -#include -#include -#include - -namespace Catch -{ - CATCH_INTERNAL_START_WARNINGS_SUPPRESSION - CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS - static LeakDetector leakDetector; - CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION -} // namespace Catch - -// Allow users of amalgamated .cpp file to remove our main and provide their own. -#if !defined(CATCH_AMALGAMATED_CUSTOM_MAIN) - - #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 __cdecl wmain(int argc, wchar_t* argv[], wchar_t*[]) -{ - #else -// Standard C/C++ main entry point -int main(int argc, char* argv[]) -{ - #endif - - // We want to force the linker not to discard the global variable - // and its constructor, as it (optionally) registers leak detector - (void)&Catch::leakDetector; - - return Catch::Session().run(argc, argv); -} - -#endif // !defined(CATCH_AMALGAMATED_CUSTOM_MAIN +#include