Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-01 22:28:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

src/3rdparty: Port doctest fix for including <ciso646> from upstream

Browse source 
This has been failing on our weekly builds for a bit. It's fixed upstream
but there's no idea when they'll release a new version that includes it.

This cherry-picks 5eb20178ba
This commit is contained in:
Tim Wojtulewicz 2025-09-08 09:44:05 -07:00
parent 08b018cc61
commit 663fc2931c
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/3rdparty/doctest.h vendored
View file

@ -490,13 +490,17 @@ DOCTEST_GCC_SUPPRESS_WARNING_POP
#endif #endif
#endif // DOCTEST_CONFIG_USE_IOSFWD #endif // DOCTEST_CONFIG_USE_IOSFWD
// for clang - always include ciso646 (which drags some std stuff) because // for clang - always include <version> or <ciso646> (which drags some std stuff)
// we want to check if we are using libc++ with the _LIBCPP_VERSION macro in // because we want to check if we are using libc++ with the _LIBCPP_VERSION macro in
// which case we don't want to forward declare stuff from std - for reference: // which case we don't want to forward declare stuff from std - for reference:
// https://github.com/doctest/doctest/issues/126 // https://github.com/doctest/doctest/issues/126
// https://github.com/doctest/doctest/issues/356 // https://github.com/doctest/doctest/issues/356
#if DOCTEST_CLANG #if DOCTEST_CLANG
#if DOCTEST_CPLUSPLUS >= 201703L && __has_include(<version>)
#include <version>
#else
#include <ciso646> #include <ciso646>
#endif
#endif // clang #endif // clang
#ifdef _LIBCPP_VERSION #ifdef _LIBCPP_VERSION