From 53a6ca299039a1bd5bd2a5fd9bded28077783f27 Mon Sep 17 00:00:00 2001 From: Steven King Date: Tue, 2 May 2000 00:27:21 +0000 Subject: [PATCH] locale_facets.h: Fix syntax error. 2000-04-30 Steven King * bits/locale_facets.h: Fix syntax error. * bits/std_fstream.h: ditto From-SVN: r33599 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/bits/locale_facets.h | 8 ++++---- libstdc++-v3/bits/std_fstream.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 61a0e79fd288..c3869766d1bb 100644 --- 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 + + * bits/locale_facets.h: Fix syntax error. + * bits/std_fstream.h: ditto + 2000-04-30 Benjamin Kosnik * 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 ec40d0f31ca9..5de91e1ada53 100644 --- 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 5326852358a9..3178c820a475 100644 --- 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. -- 2.43.5