fstream.tcc (basic_filebuf<>::open): Fix & ordering.

	* include/bits/fstream.tcc (basic_filebuf<>::open): Fix & ordering.
	* include/bits/ostream.tcc (basic_ostream<>::operator<<(long)): Same.
	(basic_ostream<>::operator<<(long long)): Same.

From-SVN: r52198

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 05c398401a3328098b5e4f63df285308e8ec334c..6533d391f62949b6ca918c624f3ccfb8a2667686 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-11  Richard Henderson  <rth@redhat.com>
+
+       * include/bits/fstream.tcc (basic_filebuf<>::open): Fix & ordering.
+       * include/bits/ostream.tcc (basic_ostream<>::operator<<(long)): Same.
+       (basic_ostream<>::operator<<(long long)): Same.
+
 2002-04-11  Richard Henderson  <rth@redhat.com>
 
        * config/linker-map.gnu: Add __gxx_personality_sj0.

diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc
index 92a0730d67b81b7a0e6a43cbf8c8540bf05a2a4c..8514323543659ec8df4b3d30ffb50913b691e9c2 100644 (file)
--- a/libstdc++-v3/include/bits/fstream.tcc
+++ b/libstdc++-v3/include/bits/fstream.tcc
@@ -165,7 +165,7 @@ namespace std
              
              // For time being, set both (in/out) sets  of pointers.
              _M_set_indeterminate();
-             if (__mode & ios_base::ate
+             if ((__mode & ios_base::ate)
                  && this->seekoff(0, ios_base::end, __mode) < 0)
                this->close();
              __ret = this;

diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc
index 5c4799b9caacd91f1586725475fdcf803fd59ff2..d15b9f2afa3c0ae3596a1c51fccb4f2538f1c825 100644 (file)
--- a/libstdc++-v3/include/bits/ostream.tcc
+++ b/libstdc++-v3/include/bits/ostream.tcc
@@ -185,7 +185,7 @@ namespace std
              if (_M_check_facet(_M_fnumput))
                {
                  bool __b = false;
-                 if (__fmt & ios_base::oct || __fmt & ios_base::hex)
+                 if ((__fmt & ios_base::oct) || (__fmt & ios_base::hex))
                    {
                      unsigned long __l = static_cast<unsigned long>(__n);
                      __b = _M_fnumput->put(*this, *this, __c, __l).failed();
@@ -248,7 +248,7 @@ namespace std
              if (_M_check_facet(_M_fnumput))
                {
                  bool __b = false;
-                 if (__fmt & ios_base::oct || __fmt & ios_base::hex)
+                 if ((__fmt & ios_base::oct) || (__fmt & ios_base::hex))
                    {
                      unsigned long long __l;
                      __l = static_cast<unsigned long long>(__n);