diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2017-05-16 14:16:34 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2017-05-16 14:16:34 +0100 |
| commit | 423624979a496c1e2755f538b1cf54736a0f449e (patch) | |
| tree | c7c46f0e46558338e76b2415bf397e914d3df053 | |
| parent | 848bf88da828bfa5467a7d07eb81f946f4937b5c (diff) | |
| download | gcc-423624979a496c1e2755f538b1cf54736a0f449e.zip gcc-423624979a496c1e2755f538b1cf54736a0f449e.tar.gz gcc-423624979a496c1e2755f538b1cf54736a0f449e.tar.bz2 | |
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.
From-SVN: r248109
| -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 0395601..8926b93 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 6918579..b4a5edf 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 |