From 5e67acc9a07ef2af9a49bc7d34d82db593ebae6a Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 12 Jan 2015 21:45:44 +0000 Subject: [PATCH] re PR libstdc++/64560 (building libstdc++ with -fno-rtti fails in new cxx11-shim-facets.cc file) PR libstdc++/64560 * src/c++11/cxx11-shim_facets.cc (locale::facet::_M_sso_shim): Check for RTTI support. From-SVN: r219495 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/src/c++11/cxx11-shim_facets.cc | 2 ++ 2 files changed, 8 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cd666d163d7..55b2a24ea55 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2015-01-12 Jonathan Wakely + + PR libstdc++/64560 + * src/c++11/cxx11-shim_facets.cc (locale::facet::_M_sso_shim): Check + for RTTI support. + 2015-01-10 Thomas Schwinge * doc/xml/manual/parallel_mode.xml: Update for libgomp being diff --git a/libstdc++-v3/src/c++11/cxx11-shim_facets.cc b/libstdc++-v3/src/c++11/cxx11-shim_facets.cc index 1a83e6cf131..56959b6f873 100644 --- a/libstdc++-v3/src/c++11/cxx11-shim_facets.cc +++ b/libstdc++-v3/src/c++11/cxx11-shim_facets.cc @@ -768,9 +768,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { using namespace __facet_shims; +#if __cpp_rtti // If this is already a shim just use its underlying facet. if (auto* p = dynamic_cast(this)) return p->_M_get(); +#endif if (which == &numpunct::id) return new numpunct_shim{this}; -- 2.30.2