From 03897a53a89665ea62e8c74a01c07701532196f9 Mon Sep 17 00:00:00 2001 From: Andreas Buhr Date: Sat, 10 Oct 2020 23:32:43 +0200 Subject: [PATCH] change doctest to always include On MSVC 1928, doctest.h fails to compile if was not included before. In the code was a statement that a similar problem existed with clang before. This patch changes doctest.h to always include . --- test/doctest/doctest.h | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/test/doctest/doctest.h b/test/doctest/doctest.h index e70d3f10..fb1a98c6 100644 --- a/test/doctest/doctest.h +++ b/test/doctest/doctest.h @@ -410,32 +410,7 @@ extern "C" __declspec(dllimport) void __stdcall DebugBreak(); #define DOCTEST_BREAK_INTO_DEBUGGER() ((void)0) #endif // linux -#ifdef __clang__ -// to detect if libc++ is being used with clang (the _LIBCPP_VERSION identifier) -#include -#endif // __clang__ - -#ifdef _LIBCPP_VERSION -// not forward declaring ostream for libc++ because I had some problems (inline namespaces vs c++98) -// so the header is used - also it is very light and doesn't drag a ton of stuff -//#include #include -#else // _LIBCPP_VERSION -#ifndef DOCTEST_CONFIG_USE_IOSFWD -namespace std -{ - template - struct char_traits; - template <> - struct char_traits; - template - class basic_ostream; - typedef basic_ostream > ostream; -} // namespace std -#else // DOCTEST_CONFIG_USE_IOSFWD -#include -#endif // DOCTEST_CONFIG_USE_IOSFWD -#endif // _LIBCPP_VERSION // static assert macro - because of the c++98 support requires that the message is an // identifier (no spaces and not a C string) - example without quotes: I_am_a_message