aboutsummaryrefslogtreecommitdiff
path: root/lib/libcxx/include/thread
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2024-05-09 01:52:26 -0700
committerAndrew Kelley <andrew@ziglang.org>2024-05-09 01:52:26 -0700
commitbcb534c295d5cc6fd63caa570cc08e6b148a507c (patch)
tree0b17cb1e632d894f50f25e550d5113f232b0e877 /lib/libcxx/include/thread
parentd9b00ee4ba48717ff6b306a6f9419e7b604ac04b (diff)
parent74f52954b9cb40d59d80b839b45bb859146731a7 (diff)
downloadzig-bcb534c295d5cc6fd63caa570cc08e6b148a507c.tar.gz
zig-bcb534c295d5cc6fd63caa570cc08e6b148a507c.zip
Merge branch 'llvm18'
Upgrades the LLVM, Clang, and LLD dependencies to LLVM 18.x Related to #16270
Diffstat (limited to 'lib/libcxx/include/thread')
-rw-r--r--lib/libcxx/include/thread12
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/libcxx/include/thread b/lib/libcxx/include/thread
index 4ddcf3ec79..84c80d04cf 100644
--- a/lib/libcxx/include/thread
+++ b/lib/libcxx/include/thread
@@ -86,10 +86,16 @@ void sleep_for(const chrono::duration<Rep, Period>& rel_time);
*/
+#include <__config>
+
+#ifdef _LIBCPP_HAS_NO_THREADS
+# error "<thread> is not supported since libc++ has been configured without support for threads."
+#endif
+
#include <__assert> // all public C++ headers provide the assertion handler
#include <__availability>
-#include <__config>
#include <__thread/formatter.h>
+#include <__thread/jthread.h>
#include <__thread/this_thread.h>
#include <__thread/thread.h>
#include <__threading_support>
@@ -104,10 +110,6 @@ void sleep_for(const chrono::duration<Rep, Period>& rel_time);
# pragma GCC system_header
#endif
-#ifdef _LIBCPP_HAS_NO_THREADS
-# error "<thread> is not supported since libc++ has been configured without support for threads."
-#endif
-
#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES)
# include <cstddef>
# include <ctime>