diff options
| author | Arthur Cohen <arthur.cohen@embecosm.com> | 2023-06-28 16:21:05 +0200 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2023-07-09 11:53:11 +0000 |
| commit | 44ffe11932693ac6b0770380a88ab41ebbbea1a0 (patch) | |
| tree | b7a44e9d801ca32c8e3aa54f5c380105e54d6cd0 | |
| parent | ba8453aeb7224a80384f00fc14e6540bf65d8025 (diff) | |
| download | gcc-44ffe11932693ac6b0770380a88ab41ebbbea1a0.zip gcc-44ffe11932693ac6b0770380a88ab41ebbbea1a0.tar.gz gcc-44ffe11932693ac6b0770380a88ab41ebbbea1a0.tar.bz2 | |
expected: Adapt type to GCC's requirements.
Disable exceptions and remove inclusion of poisoned headers.
gcc/rust/ChangeLog:
* util/expected.h: Adapt class to GCC requirements.
| -rw-r--r-- | gcc/rust/util/expected.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gcc/rust/util/expected.h b/gcc/rust/util/expected.h index cbefafc..a7ddd55 100644 --- a/gcc/rust/util/expected.h +++ b/gcc/rust/util/expected.h @@ -1,3 +1,4 @@ +// clang-format off /// // expected - An implementation of std::expected with extensions // Written in 2017 by Sy Brand (tartanllama@gmail.com, @TartanLlama) @@ -20,10 +21,7 @@ #define TL_EXPECTED_VERSION_MINOR 1 #define TL_EXPECTED_VERSION_PATCH 0 -#include <exception> -#include <functional> -#include <type_traits> -#include <utility> +#include "rust-system.h" #if defined(__EXCEPTIONS) || defined(_CPPUNWIND) #define TL_EXPECTED_EXCEPTIONS_ENABLED @@ -215,9 +213,7 @@ template <typename E> #else (void)e; #ifdef _MSC_VER - __assume(0); -#else - __builtin_unreachable(); + gcc_unreachable(); #endif #endif } |