diff options
| -rw-r--r-- | libstdc++-v3/include/bits/stl_iterator.h | 3 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/new | 4 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/new_opvnt.cc | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/18_support/destroying_delete.cc | 1 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/variant/index_type.cc | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index f0cf4c5..da740e3 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -79,6 +79,7 @@ #if __cplusplus > 201703L # include <compare> # include <new> +# include <bits/exception_defines.h> # include <bits/iterator_concepts.h> #endif @@ -2062,7 +2063,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return _M_current++; } __catch(...) { ++_M_length; - throw; + __throw_exception_again; } } diff --git a/libstdc++-v3/libsupc++/new b/libstdc++-v3/libsupc++/new index ebd1c49..21848a5 100644 --- a/libstdc++-v3/libsupc++/new +++ b/libstdc++-v3/libsupc++/new @@ -38,7 +38,7 @@ #pragma GCC system_header #include <bits/c++config.h> -#include <exception> +#include <bits/exception.h> #pragma GCC visibility push(default) @@ -52,7 +52,7 @@ namespace std * * @c bad_alloc (or classes derived from it) is used to report allocation * errors from the throwing forms of @c new. */ - class bad_alloc : public exception + class bad_alloc : public exception { public: bad_alloc() throw() { } diff --git a/libstdc++-v3/libsupc++/new_opvnt.cc b/libstdc++-v3/libsupc++/new_opvnt.cc index 9f9dace..771696d 100644 --- a/libstdc++-v3/libsupc++/new_opvnt.cc +++ b/libstdc++-v3/libsupc++/new_opvnt.cc @@ -25,7 +25,8 @@ #include <bits/c++config.h> #include "new" - +#include "exception_defines.h" + _GLIBCXX_WEAK_DEFINITION void* operator new[] (std::size_t sz, const std::nothrow_t&) noexcept { diff --git a/libstdc++-v3/testsuite/18_support/destroying_delete.cc b/libstdc++-v3/testsuite/18_support/destroying_delete.cc index 96134d7..f0c9bb9 100644 --- a/libstdc++-v3/testsuite/18_support/destroying_delete.cc +++ b/libstdc++-v3/testsuite/18_support/destroying_delete.cc @@ -19,6 +19,7 @@ // { dg-do run { target c++2a } } #include <new> +#include <type_traits> #include <testsuite_hooks.h> #ifndef __cpp_lib_destroying_delete diff --git a/libstdc++-v3/testsuite/20_util/variant/index_type.cc b/libstdc++-v3/testsuite/20_util/variant/index_type.cc index 73863fa..1c44758 100644 --- a/libstdc++-v3/testsuite/20_util/variant/index_type.cc +++ b/libstdc++-v3/testsuite/20_util/variant/index_type.cc @@ -22,4 +22,4 @@ #include <variant> static_assert(sizeof(std::variant<signed char, unsigned char>) - < sizeof(size_t)); + < sizeof(std::size_t)); |