diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2025-04-05 01:46:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-05 01:46:13 -0400 |
| commit | 0cd31fc7ff157551cfbba5da35cd79f118d2a2e3 (patch) | |
| tree | a308488f5d85184c8ec402fb3f55f1cf2704443e /lib/libcxx/include/thread | |
| parent | 8acedfd5baabab705946ad097746f9183ef62420 (diff) | |
| parent | cefe65c1b8abe65a22d4b68410db1be264fdeda0 (diff) | |
| download | zig-0cd31fc7ff157551cfbba5da35cd79f118d2a2e3.tar.gz zig-0cd31fc7ff157551cfbba5da35cd79f118d2a2e3.zip | |
Merge pull request #22780 from ziglang/llvm20
LLVM 20
Diffstat (limited to 'lib/libcxx/include/thread')
| -rw-r--r-- | lib/libcxx/include/thread | 65 |
1 files changed, 34 insertions, 31 deletions
diff --git a/lib/libcxx/include/thread b/lib/libcxx/include/thread index 25cb7ce6d7..029ed418e2 100644 --- a/lib/libcxx/include/thread +++ b/lib/libcxx/include/thread @@ -86,45 +86,48 @@ void sleep_for(const chrono::duration<Rep, Period>& rel_time); */ -#include <__config> +#if __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS) +# include <__cxx03/thread> +#else +# include <__config> -#if !defined(_LIBCPP_HAS_NO_THREADS) +# if _LIBCPP_HAS_THREADS -# include <__thread/formatter.h> -# include <__thread/jthread.h> -# include <__thread/support.h> -# include <__thread/this_thread.h> -# include <__thread/thread.h> -# include <version> +# include <__thread/this_thread.h> +# include <__thread/thread.h> + +# if _LIBCPP_STD_VER >= 20 +# include <__thread/jthread.h> +# endif + +# if _LIBCPP_STD_VER >= 23 +# include <__thread/formatter.h> +# endif + +# include <version> // standard-mandated includes // [thread.syn] -# include <compare> +# include <compare> -# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header +# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +# endif + +# endif // _LIBCPP_HAS_THREADS + +# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17 +# include <chrono> # endif -#endif // !defined(_LIBCPP_HAS_NO_THREADS) - -#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) -# include <cstddef> -# include <ctime> -# include <iosfwd> -# include <ratio> -#endif - -#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17 -# include <chrono> -#endif - -#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 -# include <cstring> -# include <functional> -# include <new> -# include <system_error> -# include <type_traits> -#endif +# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 +# include <cstring> +# include <functional> +# include <new> +# include <system_error> +# include <type_traits> +# endif +#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS) #endif // _LIBCPP_THREAD |