git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR libstdc++/85930 fix misplaced alignment-specifier 

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.

From-SVN: r261172
This commit is contained in:
Jonathan Wakely 2018-06-04 22:38:42 +01:00 committed by Jonathan Wakely
parent f0ebf6e322
commit d552d8190d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,11 @@
2018-06-04 Jonathan Wakely <jwakely@redhat.com> 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. * include/bits/postypes.h (fpos): Define special members as defaulted.
PR libstdc++/85930 PR libstdc++/85930

10
libstdc++-v3/include/bits/shared_ptr_base.h
View File

@ -49,9 +49,7 @@
#ifndef _SHARED_PTR_BASE_H #ifndef _SHARED_PTR_BASE_H
#define _SHARED_PTR_BASE_H 1 #define _SHARED_PTR_BASE_H 1
#if __cpp_rtti #include <typeinfo>
# include <typeinfo>
#endif
#include <bits/allocated_ptr.h> #include <bits/allocated_ptr.h>
#include <bits/refwrap.h> #include <bits/refwrap.h>
#include <bits/stl_function.h> #include <bits/stl_function.h>
@ -59,10 +57,6 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
#if !__cpp_rtti
class type_info;
#endif
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if _GLIBCXX_USE_DEPRECATED #if _GLIBCXX_USE_DEPRECATED
@ -516,7 +510,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static const type_info& static const type_info&
_S_ti() noexcept _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); return reinterpret_cast<const type_info&>(__tag);
} }
#endif #endif