Skip to content

Commit

Permalink
Merge pull request #75662 from ADKaster/disable-tbb-execution-on-newe…
Browse files Browse the repository at this point in the history
…r-libstdcxx

[cxx-interop] Disable c++ execution header with libstdcxx versions >= 11
  • Loading branch information
egorzhdan authored Aug 14, 2024
2 parents 14b8ab6 + 65cd7e4 commit 915b531
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion stdlib/public/Cxx/libstdcxx/libstdcxx.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#include "cstddef"

// C++17 and newer:

// <execution> includes tbb headers, which might not be installed.
// Only include <execution> if tbb is installed.
#if __has_include("execution") && __has_include(<tbb/blocked_range.h>)
#if __has_include("execution") && __has_include(<tbb/blocked_range.h>) && (!defined(_GLIBCXX_RELEASE) || (_GLIBCXX_RELEASE < 11))
#include "execution"
#endif

0 comments on commit 915b531

Please sign in to comment.