diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/cxx11-shim_facets.cc | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cd666d1..55b2a24 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2015-01-12 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/64560 + * src/c++11/cxx11-shim_facets.cc (locale::facet::_M_sso_shim): Check + for RTTI support. + 2015-01-10 Thomas Schwinge <thomas@codesourcery.com> * 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 1a83e6c..56959b6 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<const __shim*>(this)) return p->_M_get(); +#endif if (which == &numpunct<char>::id) return new numpunct_shim<char>{this}; |