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/exception | |
| 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/exception')
| -rw-r--r-- | lib/libcxx/include/exception | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/lib/libcxx/include/exception b/lib/libcxx/include/exception index 5eff8e3f8a..74229cd16c 100644 --- a/lib/libcxx/include/exception +++ b/lib/libcxx/include/exception @@ -47,7 +47,7 @@ terminate_handler set_terminate(terminate_handler f ) noexcept; terminate_handler get_terminate() noexcept; [[noreturn]] void terminate() noexcept; -bool uncaught_exception() noexcept; +bool uncaught_exception() noexcept; // deprecated in C++17, removed in C++20 int uncaught_exceptions() noexcept; // C++17 typedef unspecified exception_ptr; @@ -76,21 +76,27 @@ template <class E> void rethrow_if_nested(const E& e); */ -#include <__config> -#include <__exception/exception.h> -#include <__exception/exception_ptr.h> -#include <__exception/nested_exception.h> -#include <__exception/operations.h> -#include <__exception/terminate.h> -#include <version> - -#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -#endif - -#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 -# include <cstdlib> -# include <type_traits> -#endif +#if __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS) +# include <__cxx03/exception> +#else +# include <__config> +# include <__exception/exception.h> +# include <__exception/exception_ptr.h> +# include <__exception/nested_exception.h> +# include <__exception/operations.h> +# include <__exception/terminate.h> +# include <version> + +# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +# endif + +# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 +# include <cstddef> +# include <cstdlib> +# include <new> +# include <type_traits> +# endif +#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS) #endif // _LIBCPP_EXCEPTION |