From 9cfc400f3f84fb9b9cb9c3a5d4714fbea5686b62 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 10 Oct 2019 17:16:17 +0100 Subject: [PATCH] PR libstdc++/91057 fix bootstrap failure on powerpc PR libstdc++/91057 * src/c++98/locale.cc [_GLIBCXX_LONG_DOUBLE_COMPAT] (find_ldbl_sync_facet): Fix parameter type and missing return. From-SVN: r276840 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/src/c++98/locale.cc | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8b7443c17e8..6f04a6840ba 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2019-10-10 Jonathan Wakely + + PR libstdc++/91057 + * src/c++98/locale.cc [_GLIBCXX_LONG_DOUBLE_COMPAT] + (find_ldbl_sync_facet): Fix parameter type and missing return. + 2019-10-09 Marek Polacek PR c++/91364 - P0388R4: Permit conversions to arrays of unknown bound. diff --git a/libstdc++-v3/src/c++98/locale.cc b/libstdc++-v3/src/c++98/locale.cc index 1d00edc6f51..74a800c9c15 100644 --- a/libstdc++-v3/src/c++98/locale.cc +++ b/libstdc++-v3/src/c++98/locale.cc @@ -478,7 +478,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifdef _GLIBCXX_LONG_DOUBLE_COMPAT namespace { inline locale::id* - find_ldbl_sync_facet(locale::id* __idp) + find_ldbl_sync_facet(const locale::id* __idp) { # define _GLIBCXX_SYNC_ID(facet, mangled) \ if (__idp == &::mangled) \ @@ -494,6 +494,7 @@ namespace { _GLIBCXX_SYNC_ID (money_get, _ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE); _GLIBCXX_SYNC_ID (money_put, _ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE); # endif + return 0; } } // namespace #endif