aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@unitus.it>2001-12-27 13:13:23 +0100
committerPaolo Carlini <paolo@gcc.gnu.org>2001-12-27 12:13:23 +0000
commitb206658a5f5289080b7ae15f7bff84eaa993c0a9 (patch)
treed1bfbb0db13ddc5c3ab619f7758dcd2edb68e78b
parent110fa837013ce8a0a1970e63efbcafc6715ecee6 (diff)
downloadgcc-b206658a5f5289080b7ae15f7bff84eaa993c0a9.zip
gcc-b206658a5f5289080b7ae15f7bff84eaa993c0a9.tar.gz
gcc-b206658a5f5289080b7ae15f7bff84eaa993c0a9.tar.bz2
locale_facets.tcc (collate::do_transform): Adjust implicit typename.
2001-12-27 Paolo Carlini <pcarlini@unitus.it> * 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
-rw-r--r--libstdc++-v3/ChangeLog11
-rw-r--r--libstdc++-v3/config/locale/messages_members_generic.h6
-rw-r--r--libstdc++-v3/config/locale/messages_members_gnu.h6
-rw-r--r--libstdc++-v3/config/locale/messages_members_ieee_1003.1-200x.h6
-rw-r--r--libstdc++-v3/include/bits/locale_facets.tcc2
5 files changed, 21 insertions, 10 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ffdc436..b94f4db 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2001-12-27 Paolo Carlini <pcarlini@unitus.it>
+
+ * 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 <pme@gcc.gnu.org>
PR libstdc++/3829
diff --git a/libstdc++-v3/config/locale/messages_members_generic.h b/libstdc++-v3/config/locale/messages_members_generic.h
index 133bcd9..62dd24d 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<typename _CharT>
- messages<_CharT>::catalog
+ typename messages<_CharT>::catalog
messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
const char*) const
{ return this->do_open(__s, __loc); }
// Virtual member functions.
template<typename _CharT>
- messages<_CharT>::catalog
+ typename messages<_CharT>::catalog
messages<_CharT>::do_open(const basic_string<char>&, const locale&) const
{ return 0; }
template<typename _CharT>
- 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 0d7a630..07d2195 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<typename _CharT>
- messages<_CharT>::catalog
+ typename messages<_CharT>::catalog
messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
const char* __dir) const
{
@@ -44,7 +44,7 @@
}
template<typename _CharT>
- messages<_CharT>::catalog
+ typename messages<_CharT>::catalog
messages<_CharT>::do_open(const basic_string<char>& __s,
const locale&) const
{
@@ -55,7 +55,7 @@
}
template<typename _CharT>
- 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 c490135..ce82eb8 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<typename _CharT>
- messages<_CharT>::catalog
+ typename messages<_CharT>::catalog
messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
const char*) const
{ return this->do_open(__s, __loc); }
@@ -46,13 +46,13 @@
{ }
template<typename _CharT>
- messages<_CharT>::catalog
+ typename messages<_CharT>::catalog
messages<_CharT>::do_open(const basic_string<char>& __s,
const locale&) const
{ return reinterpret_cast<catalog>(catopen(__s.c_str(), NL_CAT_LOCALE)); }
template<typename _CharT>
- 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 026f783..58d72c7 100644
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -1974,7 +1974,7 @@ namespace std
}
template<typename _CharT>
- collate<_CharT>::string_type
+ typename collate<_CharT>::string_type
collate<_CharT>::
do_transform(const _CharT* __lo, const _CharT* __hi) const
{