# HG changeset patch # User jwe # Date 1033169000 0 # Node ID bd51df637cb3fb7fc9cfcdd7cdcaa397e1193f86 # Parent b5267e631ba8c1181952e4e78f65671c5066f41d [project @ 2002-09-27 23:23:20 by jwe] diff -r b5267e631ba8 -r bd51df637cb3 src/ChangeLog --- a/src/ChangeLog Fri Sep 27 22:48:46 2002 +0000 +++ b/src/ChangeLog Fri Sep 27 23:23:20 2002 +0000 @@ -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 diff -r b5267e631ba8 -r bd51df637cb3 src/oct-stream.cc --- a/src/oct-stream.cc Fri Sep 27 22:48:46 2002 +0000 +++ b/src/oct-stream.cc Fri Sep 27 23:23:20 2002 +0000 @@ -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;