From b206658a5f5289080b7ae15f7bff84eaa993c0a9 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 27 Dec 2001 13:13:23 +0100 Subject: [PATCH] locale_facets.tcc (collate::do_transform): Adjust implicit typename. 2001-12-27 Paolo Carlini * include/bits/locale_facets.tcc (collate::do_transform): Adjust implicit typename. * config/locale/messages_members_generic.h (messages::open, messages::do_open, messages::do_get): Adjust implicit typename. * config/locale/messages_members_gnu.h (messages::open, messages::do_open, messages::do_get): Adjust Implicit typename. * config/locale/messages_members_ieee_1003.1-200x.h (messages::open, messages::do_open, messages::do_get): Adjust implicit typename. From-SVN: r48327 --- libstdc++-v3/ChangeLog | 11 +++++++++++ libstdc++-v3/config/locale/messages_members_generic.h | 6 +++--- libstdc++-v3/config/locale/messages_members_gnu.h | 6 +++--- .../config/locale/messages_members_ieee_1003.1-200x.h | 6 +++--- libstdc++-v3/include/bits/locale_facets.tcc | 2 +- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ffdc436a869..b94f4db650f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2001-12-27 Paolo Carlini + + * include/bits/locale_facets.tcc (collate::do_transform): + Adjust implicit typename. + * config/locale/messages_members_generic.h (messages::open, + messages::do_open, messages::do_get): Adjust implicit typename. + * config/locale/messages_members_gnu.h (messages::open, + messages::do_open, messages::do_get): Adjust Implicit typename. + * config/locale/messages_members_ieee_1003.1-200x.h (messages::open, + messages::do_open, messages::do_get): Adjust implicit typename. + 2001-12-27 Phil Edwards PR libstdc++/3829 diff --git a/libstdc++-v3/config/locale/messages_members_generic.h b/libstdc++-v3/config/locale/messages_members_generic.h index 133bcd918a7..62dd24d6838 100644 --- a/libstdc++-v3/config/locale/messages_members_generic.h +++ b/libstdc++-v3/config/locale/messages_members_generic.h @@ -35,19 +35,19 @@ // Non-virtual member functions. template - messages<_CharT>::catalog + typename messages<_CharT>::catalog messages<_CharT>::open(const basic_string& __s, const locale& __loc, const char*) const { return this->do_open(__s, __loc); } // Virtual member functions. template - messages<_CharT>::catalog + typename messages<_CharT>::catalog messages<_CharT>::do_open(const basic_string&, const locale&) const { return 0; } template - messages<_CharT>::string_type + typename messages<_CharT>::string_type messages<_CharT>::do_get(catalog, int, int, const string_type& __dfault) const { return __dfault; } diff --git a/libstdc++-v3/config/locale/messages_members_gnu.h b/libstdc++-v3/config/locale/messages_members_gnu.h index 0d7a6300a52..07d2195f2c0 100644 --- a/libstdc++-v3/config/locale/messages_members_gnu.h +++ b/libstdc++-v3/config/locale/messages_members_gnu.h @@ -35,7 +35,7 @@ // Non-virtual member functions. template - messages<_CharT>::catalog + typename messages<_CharT>::catalog messages<_CharT>::open(const basic_string& __s, const locale& __loc, const char* __dir) const { @@ -44,7 +44,7 @@ } template - messages<_CharT>::catalog + typename messages<_CharT>::catalog messages<_CharT>::do_open(const basic_string& __s, const locale&) const { @@ -55,7 +55,7 @@ } template - messages<_CharT>::string_type + typename messages<_CharT>::string_type messages<_CharT>::do_get(catalog, int, int, const string_type& __dfault) const { diff --git a/libstdc++-v3/config/locale/messages_members_ieee_1003.1-200x.h b/libstdc++-v3/config/locale/messages_members_ieee_1003.1-200x.h index c4901352796..ce82eb8cdf8 100644 --- a/libstdc++-v3/config/locale/messages_members_ieee_1003.1-200x.h +++ b/libstdc++-v3/config/locale/messages_members_ieee_1003.1-200x.h @@ -35,7 +35,7 @@ // Non-virtual member functions. template - messages<_CharT>::catalog + typename messages<_CharT>::catalog messages<_CharT>::open(const basic_string& __s, const locale& __loc, const char*) const { return this->do_open(__s, __loc); } @@ -46,13 +46,13 @@ { } template - messages<_CharT>::catalog + typename messages<_CharT>::catalog messages<_CharT>::do_open(const basic_string& __s, const locale&) const { return reinterpret_cast(catopen(__s.c_str(), NL_CAT_LOCALE)); } template - messages<_CharT>::string_type + typename messages<_CharT>::string_type messages<_CharT>::do_get(catalog __c, int __setid, int __msgid, const string_type& __dfault) const { diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 026f7833d9d..58d72c7fd0c 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -1974,7 +1974,7 @@ namespace std } template - collate<_CharT>::string_type + typename collate<_CharT>::string_type collate<_CharT>:: do_transform(const _CharT* __lo, const _CharT* __hi) const {