From: Benjamin Kosnik <bkoz@purist.soma.redhat.com>
Date: Thu, 2 Nov 2000 08:05:16 +0000 (+0000)
Subject: locale.cc: Match orderings for static members.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d83c7eb40da8e67095300c482a036744110e6203;p=gcc.git

locale.cc: Match orderings for static members.


2000-11-02  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>

	* src/locale.cc: Match orderings for static members.
	* include/bits/fstream.tcc: Fixes for cin.

From-SVN: r37200
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2967ba03668..56ef6ccad89 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-02  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
+
+	* src/locale.cc: Match orderings for static members.
+	* include/bits/fstream.tcc: Fixes for cin.
+
 2000-11-02  Gabriel Dos Reis  <gdr@codesourcery.com>
 
 	* include/bits/std_complex.h (complex<>): Remove (cos<>, cosh<>,
diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc
index d3a57501097..72940ea87cd 100644
--- a/libstdc++-v3/include/bits/fstream.tcc
+++ b/libstdc++-v3/include/bits/fstream.tcc
@@ -240,18 +240,15 @@ namespace std
 	      if (0 < __size)
 		{
 		  _M_set_determinate(__size);
+		  if (__testout)
+		    _M_out_cur = _M_in_cur;
+		  __ret = traits_type::to_int_type(*_M_in_cur);
 		  streamoff __p = _M_file->seekoff(0 - __size, ios_base::cur, 
 						   ios_base::in);
 		  if (__p == -1)
 		    {
 		      // XXX Something is wrong, do error checking.
 		    }
-		  else
-		    {
-		      if (__testout)
-			_M_out_cur = _M_in_cur;
-		      __ret = traits_type::to_int_type(*_M_in_cur);
-		    }
 		}
 #else
 	      // 2000-08-04 bkoz disable
diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc
index 4f886dcf565..782cec0a234 100644
--- a/libstdc++-v3/src/locale.cc
+++ b/libstdc++-v3/src/locale.cc
@@ -53,8 +53,8 @@ namespace std {
   const locale::category 	locale::messages;
   const locale::category 	locale::all;
 
-  locale::_Impl* 		locale::_S_global; 
   locale::_Impl* 		locale::_S_classic;
+  locale::_Impl* 		locale::_S_global; 
   const int 			locale::_S_categories_num;
   const int 			locale::_S_facets_num;