Mercurial > hg > octave-nkf

changeset 4078:bd51df637cb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2002-09-27 23:23:20 by jwe]
author jwe
date Fri, 27 Sep 2002 23:23:20 +0000
parents b5267e631ba8
children c0532bbaefd7
files src/ChangeLog src/oct-stream.cc
diffstat 2 files changed, 16 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,8 @@
 	ios::app for "a+" mode.
 	* oct-stream.cc (octave_stream::mode_as_string): Recognize
 	ios::ate, not ios::app as "a+" mode.
+	(octave_stream::mode_as_string): Use parens since | has lower
+	precedence than ==.
 
 2002-09-26  Paul Kienzle <pkienzle@users.sf.net>
 
--- a/src/oct-stream.cc
+++ b/src/oct-stream.cc
@@ -2827,30 +2827,30 @@
   if (in_mode == std::ios::in)
     retval = "r";
   else if (in_mode == std::ios::out 
-           || in_mode == std::ios::out | std::ios::trunc)
+           || in_mode == (std::ios::out | std::ios::trunc))
     retval = "w";
-  else if (in_mode == std::ios::out | std::ios::app)
+  else if (in_mode == (std::ios::out | std::ios::app))
     retval = "a";
-  else if (in_mode == std::ios::in | std::ios::out)
+  else if (in_mode == (std::ios::in | std::ios::out))
     retval = "r+";
-  else if (in_mode == std::ios::in | std::ios::out | std::ios::trunc)
+  else if (in_mode == (std::ios::in | std::ios::out | std::ios::trunc))
     retval = "w+";
-  else if (in_mode == std::ios::in | std::ios::out | std::ios::ate)
+  else if (in_mode == (std::ios::in | std::ios::out | std::ios::ate))
     retval = "a+";
-  else if (in_mode == std::ios::in | std::ios::binary)
+  else if (in_mode == (std::ios::in | std::ios::binary))
     retval = "rb";
-  else if (in_mode == std::ios::out | std::ios::binary
-           || in_mode == std::ios::out | std::ios::trunc | std::ios::binary)
+  else if (in_mode == (std::ios::out | std::ios::binary)
+	   || in_mode == (std::ios::out | std::ios::trunc | std::ios::binary))
     retval = "wb";
-  else if (in_mode == std::ios::out | std::ios::app | std::ios::binary)
+  else if (in_mode == (std::ios::out | std::ios::app | std::ios::binary))
     retval = "ab";
-  else if (in_mode == std::ios::in | std::ios::out | std::ios::binary)
+  else if (in_mode == (std::ios::in | std::ios::out | std::ios::binary))
     retval = "r+b";
-  else if (in_mode == std::ios::in | std::ios::out | std::ios::trunc 
-           | std::ios::binary)
+  else if (in_mode == (std::ios::in | std::ios::out | std::ios::trunc 
+		       | std::ios::binary))
     retval = "w+b";
-  else if (in_mode == std::ios::in | std::ios::out | std::ios::ate
-           | std::ios::binary)
+  else if (in_mode == (std::ios::in | std::ios::out | std::ios::ate
+		       | std::ios::binary))
     retval = "a+b";
 
   return retval;