This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[v3] More implicit typename fixes


Hi,

I have just committed this patch adding some more missing typename keywords, in
preparation for the new parser. Approved by Gabriel Dos Reis.

Cheers,
Paolo.

///////////

        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.

===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/bits/locale_facets.tcc,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gcc/libstdc++-v3/include/bits/locale_facets.tcc     2001/12/12 20:23:29
1.46
+++ gcc/libstdc++-v3/include/bits/locale_facets.tcc     2001/12/27 12:13:23
1.47
@@ -1974,7 +1974,7 @@
     }

  template<typename _CharT>
-    collate<_CharT>::string_type
+    typename collate<_CharT>::string_type
     collate<_CharT>::
     do_transform(const _CharT* __lo, const _CharT* __hi) const
     {

===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/messages_members_gnu.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc/libstdc++-v3/config/locale/messages_members_gnu.h       2001/12/15
07:05:03     1.2
+++ gcc/libstdc++-v3/config/locale/messages_members_gnu.h       2001/12/27
12:13:23     1.3
@@ -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
     {
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/messages_members_generic.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc/libstdc++-v3/config/locale/messages_members_generic.h   2001/12/15
07:05:03     1.2
+++ gcc/libstdc++-v3/config/locale/messages_members_generic.h   2001/12/27
12:13:23     1.3
@@ -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; }

===================================================================
RCS file:
/cvs/gcc/gcc/libstdc++-v3/config/locale/messages_members_ieee_1003.1-200x.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc/libstdc++-v3/config/locale/messages_members_ieee_1003.1-200x.h
2001/08/08 02:48:58     1.1
+++ gcc/libstdc++-v3/config/locale/messages_members_ieee_1003.1-200x.h
2001/12/27 12:13:23     1.2
@@ -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
     {






Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]