diff options
author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-05-16 13:16:34 +0000 |
---|---|---|
committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-05-16 13:16:34 +0000 |
commit | c59b1fb0370915949455bafcfc7ba8ed4a2fedf3 (patch) | |
tree | c7c46f0e46558338e76b2415bf397e914d3df053 /libstdc++-v3 | |
parent | 6767ca9a1aee01c30b4a33255e48c132dd0d8ce7 (diff) | |
download | gcc-c59b1fb0370915949455bafcfc7ba8ed4a2fedf3.tar.gz |
Fix forward declaration of std::type_info for versioned-namespace
PR libstdc++/80285
* include/bits/shared_ptr_base.h [!__cpp_rtti] (type_info): Declare
outside versioned namespace.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@248109 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/shared_ptr_base.h | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 039560109c5..8926b933fc8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2017-05-16 Jonathan Wakely <jwakely@redhat.com> + PR libstdc++/80285 + * include/bits/shared_ptr_base.h [!__cpp_rtti] (type_info): Declare + outside versioned namespace. + * configure: Regenerate. 2017-05-16 Marc Glisse <marc.glisse@inria.fr> diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index 69185794a85..b4a5edfdf43 100644 --- a/libstdc++-v3/include/bits/shared_ptr_base.h +++ b/libstdc++-v3/include/bits/shared_ptr_base.h @@ -59,6 +59,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { +#if !__cpp_rtti + class type_info; +#endif + _GLIBCXX_BEGIN_NAMESPACE_VERSION #if _GLIBCXX_USE_DEPRECATED @@ -68,10 +72,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #pragma GCC diagnostic pop #endif -#if !__cpp_rtti - class type_info; -#endif - /** * @brief Exception possibly thrown by @c shared_ptr. * @ingroup exceptions |