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 2967ba036681df9997cc07003702138ed5adfc96..56ef6ccad894b7916ff7616b34196e7c1e1e2a8e 100644 (file)
--- 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 d3a57501097415b8b7c4aa72bb4d6a995674fee4..72940ea87cd828609dce5bab065258a169eb84af 100644 (file)
--- 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 4f886dcf56512d996df0bedd502d9f46ef1943ef..782cec0a234b7dcf7bb32cf07715f427218d9fb8 100644 (file)
--- 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;