diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/shared_ptr_base.h | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ebfdd36..2a201ae 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2018-06-04 Jonathan Wakely <jwakely@redhat.com> + PR libstdc++/85930 + * include/bits/shared_ptr_base.h [!__cpp_rtti]: Include <typeinfo> + unconditionally. Remove redundant declaration. + [!__cpp_rtti] (_Sp_make_shared_tag::_S_ti): Fix location of + alignment-specifier. + * include/bits/postypes.h (fpos): Define special members as defaulted. PR libstdc++/85930 diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index 22cb7eb..6c5089a 100644 --- a/libstdc++-v3/include/bits/shared_ptr_base.h +++ b/libstdc++-v3/include/bits/shared_ptr_base.h @@ -49,9 +49,7 @@ #ifndef _SHARED_PTR_BASE_H #define _SHARED_PTR_BASE_H 1 -#if __cpp_rtti -# include <typeinfo> -#endif +#include <typeinfo> #include <bits/allocated_ptr.h> #include <bits/refwrap.h> #include <bits/stl_function.h> @@ -59,10 +57,6 @@ namespace std _GLIBCXX_VISIBILITY(default) { -#if !__cpp_rtti - class type_info; -#endif - _GLIBCXX_BEGIN_NAMESPACE_VERSION #if _GLIBCXX_USE_DEPRECATED @@ -516,7 +510,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static const type_info& _S_ti() noexcept { - static constexpr alignas(type_info) _Sp_make_shared_tag __tag; + alignas(type_info) static constexpr _Sp_make_shared_tag __tag; return reinterpret_cast<const type_info&>(__tag); } #endif |