locale_facets.h: Fix syntax error.

2000-04-30  Steven King <sxking@uswest.net>

        * bits/locale_facets.h: Fix syntax  error.
        * bits/std_fstream.h: ditto

From-SVN: r33599

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 61a0e79fd288211878029f3e0aa27ff5255b5a12..c3869766d1bb674d24a2373383d2a47cc88ca740 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -4,6 +4,11 @@
        * src/Makefile.in: Regenerate.
        * acinclude.m4 (GLIBCPP_ENABLE_DEBUG): Revert.
 
+2000-04-30  Steven King <sxking@uswest.net>
+
+        * bits/locale_facets.h: Fix syntax  error.
+        * bits/std_fstream.h: ditto
+
 2000-04-30  Benjamin Kosnik  <bkoz@gnu.org>
 
        * config/cpu/powerpc/bits/atomicity.h (__compare_and_swap): Fix typo.

diff --git a/libstdc++-v3/bits/locale_facets.h b/libstdc++-v3/bits/locale_facets.h
index ec40d0f31ca920f0cdc2b2b815b99498a97b4bca..5de91e1ada533d89bf4cf9cb01ecc7d81f7e39af 100644 (file)
--- a/libstdc++-v3/bits/locale_facets.h
+++ b/libstdc++-v3/bits/locale_facets.h
@@ -747,10 +747,10 @@ namespace std
     {
     public: 
       // Types:
-      typedef _CharT                   char_type;
-      typedef char_traits<_CharT>      traits_type;
-      typedef basic_string<_CharT>     string_type;
-      typedef string_type::size_type   size_type;
+      typedef _CharT                           char_type;
+      typedef char_traits<_CharT>              traits_type;
+      typedef basic_string<_CharT>             string_type;
+      typedef typename string_type::size_type  size_type;
 
       // Forward decls and Friends:
       friend class locale;

diff --git a/libstdc++-v3/bits/std_fstream.h b/libstdc++-v3/bits/std_fstream.h
index 5326852358a9d893d5df15fe8ddb0d552a6e2d3c..3178c820a475558f545a9a05810ae7a5c3e84cb3 100644 (file)
--- a/libstdc++-v3/bits/std_fstream.h
+++ b/libstdc++-v3/bits/std_fstream.h
@@ -59,7 +59,7 @@ namespace std {
       typedef __basic_file                               __file_type;
       typedef typename _Traits::state_type                __state_type;
       typedef codecvt<_CharT, char, __state_type>         __codecvt_type;
-      typedef codecvt<_CharT, char, __state_type>::result __res_type;
+      typedef typename __codecvt_type::result            __res_type;
       
       friend ios_base; // For sync_with_stdio.