Mercurial > hg > octave-lojdl
changeset 3544:71bd2d124119
[project @ 2000-02-02 21:02:31 by jwe]
author | jwe |
---|---|
date | Wed, 02 Feb 2000 21:02:41 +0000 |
parents | c5b996022ef7 |
children | 673745c96480 |
files | src/ChangeLog src/DLD-FUNCTIONS/dassl.cc src/DLD-FUNCTIONS/fsolve.cc src/DLD-FUNCTIONS/lsode.cc src/DLD-FUNCTIONS/quad.cc src/file-io.cc src/oct-fstrm.cc src/oct-fstrm.h src/oct-hist.cc src/oct-iostrm.cc src/oct-iostrm.h src/oct-prcstrm.cc src/oct-prcstrm.h src/oct-procbuf.cc src/oct-stdstrm.cc src/oct-stdstrm.h src/oct-stream.h src/oct-strstrm.cc src/ov-base.cc src/ov-base.h src/ov-builtin.cc src/ov-builtin.h src/ov-fcn.h src/ov-mapper.cc src/ov-mapper.h src/ov-usr-fcn.cc src/ov-usr-fcn.h src/ov.cc src/ov.h src/pager.cc src/parse.y src/procstream.cc src/procstream.h src/pt-id.cc src/pt-idx.cc src/symtab.cc |
diffstat | 36 files changed, 110 insertions(+), 97 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2000-02-02 John W. Eaton <jwe@bevo.che.wisc.edu> + * ov.h (octave_value::do_multi_index_op): Rename from do_index_op. + + * ov-fcn.h (octave_function::is_system_fcn_file): Now const. + * Map.cc (index_to_CHptr): Now a macro. (CHMap<C>::hash): Now a member function.
--- a/src/DLD-FUNCTIONS/dassl.cc +++ b/src/DLD-FUNCTIONS/dassl.cc @@ -86,7 +86,7 @@ if (dassl_fcn) { - octave_value_list tmp = dassl_fcn->do_index_op (1, args); + octave_value_list tmp = dassl_fcn->do_multi_index_op (1, args); if (error_state) {
--- a/src/DLD-FUNCTIONS/fsolve.cc +++ b/src/DLD-FUNCTIONS/fsolve.cc @@ -109,7 +109,7 @@ if (fsolve_fcn) { - octave_value_list tmp = fsolve_fcn->do_index_op (1, args); + octave_value_list tmp = fsolve_fcn->do_multi_index_op (1, args); if (tmp.length () > 0 && tmp(0).is_defined ()) { retval = ColumnVector (tmp(0).vector_value ());
--- a/src/DLD-FUNCTIONS/lsode.cc +++ b/src/DLD-FUNCTIONS/lsode.cc @@ -70,7 +70,7 @@ if (lsode_fcn) { - octave_value_list tmp = lsode_fcn->do_index_op (1, args); + octave_value_list tmp = lsode_fcn->do_multi_index_op (1, args); if (error_state) { @@ -110,7 +110,7 @@ if (lsode_jac) { - octave_value_list tmp = lsode_jac->do_index_op (1, args); + octave_value_list tmp = lsode_jac->do_multi_index_op (1, args); if (error_state) {
--- a/src/DLD-FUNCTIONS/quad.cc +++ b/src/DLD-FUNCTIONS/quad.cc @@ -63,7 +63,7 @@ if (quad_fcn) { - octave_value_list tmp = quad_fcn->do_index_op (1, args); + octave_value_list tmp = quad_fcn->do_multi_index_op (1, args); if (error_state) {
--- a/src/file-io.cc +++ b/src/file-io.cc @@ -104,29 +104,29 @@ // Could probably be faster, but does it really matter? if (mode == "r") - retval = ios::in; + retval = std::ios::in; else if (mode == "w") - retval = ios::out | ios::trunc; + retval = std::ios::out | std::ios::trunc; else if (mode == "a") - retval = ios::out | ios::app; + retval = std::ios::out | std::ios::app; else if (mode == "r+") - retval = ios::in | ios::out; + retval = std::ios::in | std::ios::out; else if (mode == "w+") - retval = ios::in | ios::out | ios::trunc; + retval = std::ios::in | std::ios::out | std::ios::trunc; else if (mode == "a+") - retval = ios::in | ios::out | ios::app; + retval = std::ios::in | std::ios::out | std::ios::app; else if (mode == "rb") - retval = ios::in | ios::bin; + retval = std::ios::in | std::ios::bin; else if (mode == "wb") - retval = ios::out | ios::trunc | ios::bin; + retval = std::ios::out | std::ios::trunc | std::ios::bin; else if (mode == "ab") - retval = ios::out | ios::app | ios::bin; + retval = std::ios::out | std::ios::app | std::ios::bin; else if (mode == "r+b") - retval = ios::in | ios::out | ios::bin; + retval = std::ios::in | std::ios::out | std::ios::bin; else if (mode == "w+b") - retval = ios::in | ios::out | ios::trunc | ios::bin; + retval = std::ios::in | std::ios::out | std::ios::trunc | std::ios::bin; else if (mode == "a+b") - retval = ios::in | ios::out | ios::app | ios::bin; + retval = std::ios::in | std::ios::out | std::ios::app | std::ios::bin; else ::error ("invalid mode specified"); }
--- a/src/oct-fstrm.cc +++ b/src/oct-fstrm.cc @@ -31,15 +31,16 @@ #include "oct-fstrm.h" octave_stream -octave_fstream::create (const std::string& nm_arg, ios::openmode md, +octave_fstream::create (const std::string& nm_arg, std::ios::openmode md, oct_mach_info::float_format flt_fmt) { return octave_stream (new octave_fstream (nm_arg, md, flt_fmt)); } -octave_fstream::octave_fstream (const std::string& nm_arg, - ios::openmode md = ios::in|ios::out, - oct_mach_info::float_format flt_fmt) +octave_fstream::octave_fstream + (const std::string& nm_arg, + std::ios::openmode md = std::ios::in|std::ios::out, + oct_mach_info::float_format flt_fmt) : octave_base_stream (md, flt_fmt), nm (nm_arg) { // Override default protection of 0664 so that umask will appear to @@ -58,7 +59,7 @@ // Position a stream at OFFSET relative to ORIGIN. int -octave_fstream::seek (streamoff offset, ios::seek_dir origin) +octave_fstream::seek (streamoff offset, std::ios::seek_dir origin) { int retval = -1; @@ -88,7 +89,7 @@ if (fs) { filebuf *fb = fs.rdbuf (); - retval = static_cast<long> (fb->seekoff (0, ios::cur)); + retval = static_cast<long> (fb->seekoff (0, std::ios::cur)); } return retval; @@ -107,7 +108,7 @@ { std::istream *retval = 0; - if (mode () & ios::in) + if (mode () & std::ios::in) retval = &fs; return retval; @@ -118,7 +119,7 @@ { std::ostream *retval = 0; - if (mode () & ios::out) + if (mode () & std::ios::out) retval = &fs; return retval;
--- a/src/oct-fstrm.h +++ b/src/oct-fstrm.h @@ -33,17 +33,18 @@ public: octave_fstream (const std::string& nm_arg, - ios::openmode md = ios::in|ios::out, + std::ios::openmode md = std::ios::in|std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native); static octave_stream - create (const std::string& nm_arg, ios::openmode md = ios::in|ios::out, + create (const std::string& nm_arg, + std::ios::openmode md = std::ios::in|std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native); // Position a stream at OFFSET relative to ORIGIN. - int seek (streamoff offset, ios::seek_dir origin); + int seek (streamoff offset, std::ios::seek_dir origin); // Return current stream position.
--- a/src/oct-hist.cc +++ b/src/oct-hist.cc @@ -114,7 +114,7 @@ if (! env_file.empty ()) { - fstream f (env_file.c_str (), (ios::in | ios::out)); + fstream f (env_file.c_str (), (std::ios::in | std::ios::out)); if (f) { @@ -405,7 +405,7 @@ std::string name = file_ops::tempnam ("", "oct-"); - fstream file (name.c_str (), ios::out); + fstream file (name.c_str (), std::ios::out); if (! file) { @@ -457,7 +457,7 @@ // Write the commands to the history file since parse_and_execute // disables command line history while it executes. - fstream file (name.c_str (), ios::in); + fstream file (name.c_str (), std::ios::in); char *line; int first = 1;
--- a/src/oct-iostrm.cc +++ b/src/oct-iostrm.cc @@ -30,7 +30,7 @@ // Position a stream at OFFSET relative to ORIGIN. int -octave_base_iostream::seek (streamoff, ios::seek_dir) +octave_base_iostream::seek (streamoff, std::ios::seek_dir) { invalid_operation (); return -1;
--- a/src/oct-iostrm.h +++ b/src/oct-iostrm.h @@ -33,14 +33,14 @@ public: octave_base_iostream (const std::string& n = std::string (), - ios::openmode md = ios::in|ios::out, + std::ios::openmode md = std::ios::in|std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native) : octave_base_stream (md, flt_fmt), nm (n) { } // Position a stream at OFFSET relative to ORIGIN. - int seek (streamoff offset, ios::seek_dir origin); + int seek (streamoff offset, std::ios::seek_dir origin); // Return current stream position. @@ -79,7 +79,7 @@ public: octave_istream (std::istream *arg = 0, const std::string& nm = std::string ()) - : octave_base_iostream (nm, ios::in, oct_mach_info::native), + : octave_base_iostream (nm, std::ios::in, oct_mach_info::native), is (arg) { } static octave_stream @@ -116,7 +116,7 @@ public: octave_ostream (std::ostream *arg, const std::string& nm = std::string ()) - : octave_base_iostream (nm, ios::out, oct_mach_info::native), + : octave_base_iostream (nm, std::ios::out, oct_mach_info::native), os (arg) { } static octave_stream
--- a/src/oct-prcstrm.cc +++ b/src/oct-prcstrm.cc @@ -29,14 +29,14 @@ #include "oct-prcstrm.h" octave_stream -octave_iprocstream::create (const std::string& n, ios::openmode arg_md, +octave_iprocstream::create (const std::string& n, std::ios::openmode arg_md, oct_mach_info::float_format flt_fmt) { return octave_stream (new octave_iprocstream (n, arg_md, flt_fmt)); } octave_iprocstream::octave_iprocstream (const std::string& n, - ios::openmode arg_md, + std::ios::openmode arg_md, oct_mach_info::float_format flt_fmt) : octave_istdiostream (n, 0, arg_md, flt_fmt) { @@ -59,14 +59,14 @@ } octave_stream -octave_oprocstream::create (const std::string& n, ios::openmode arg_md, +octave_oprocstream::create (const std::string& n, std::ios::openmode arg_md, oct_mach_info::float_format flt_fmt) { return octave_stream (new octave_oprocstream (n, arg_md, flt_fmt)); } octave_oprocstream::octave_oprocstream (const std::string& n, - ios::openmode arg_md, + std::ios::openmode arg_md, oct_mach_info::float_format flt_fmt) : octave_ostdiostream (n, 0, arg_md, flt_fmt) {
--- a/src/oct-prcstrm.h +++ b/src/oct-prcstrm.h @@ -31,12 +31,12 @@ public: octave_iprocstream (const std::string& n, - ios::openmode arg_md = ios::in, + std::ios::openmode arg_md = std::ios::in, oct_mach_info::float_format flt_fmt = oct_mach_info::native); static octave_stream - create (const std::string& n, ios::openmode arg_md = ios::in, + create (const std::string& n, std::ios::openmode arg_md = std::ios::in, oct_mach_info::float_format flt_fmt = oct_mach_info::native); protected: @@ -58,12 +58,12 @@ public: octave_oprocstream (const std::string& n, - ios::openmode arg_md = ios::out, + std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native); static octave_stream - create (const std::string& n, ios::openmode arg_md = ios::out, + create (const std::string& n, std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native); protected:
--- a/src/oct-procbuf.cc +++ b/src/oct-procbuf.cc @@ -69,7 +69,7 @@ int pipe_fds[2]; - volatile int child_std_end = (mode & ios::in) ? 1 : 0; + volatile int child_std_end = (mode & std::ios::in) ? 1 : 0; volatile int parent_end, child_end; @@ -79,7 +79,7 @@ if (pipe (pipe_fds) < 0) return 0; - if (mode & ios::in) + if (mode & std::ios::in) { parent_end = pipe_fds[0]; child_end = pipe_fds[1];
--- a/src/oct-stdstrm.cc +++ b/src/oct-stdstrm.cc @@ -40,7 +40,7 @@ // Position a stream at OFFSET relative to ORIGIN. int -octave_base_stdiostream::seek (streamoff offset, ios::seek_dir origin) +octave_base_stdiostream::seek (streamoff offset, std::ios::seek_dir origin) { int retval = -1;
--- a/src/oct-stdstrm.h +++ b/src/oct-stdstrm.h @@ -32,15 +32,15 @@ { public: - octave_base_stdiostream (const std::string& n, FILE *f, - ios::openmode arg_md = ios::in|ios::out, - oct_mach_info::float_format flt_fmt = - oct_mach_info::native) + octave_base_stdiostream + (const std::string& n, FILE *f, + std::ios::openmode arg_md = std::ios::in|std::ios::out, + oct_mach_info::float_format flt_fmt = oct_mach_info::native) : octave_base_stream (arg_md, flt_fmt), nm (n), fp (f) { } // Position a stream at OFFSET relative to ORIGIN. - int seek (streamoff offset, ios::seek_dir origin); + int seek (streamoff offset, std::ios::seek_dir origin); // Return current stream position. @@ -77,12 +77,13 @@ public: octave_istdiostream (const std::string& n, FILE *f = 0, - ios::openmode arg_md = ios::in, + std::ios::openmode arg_md = std::ios::in, oct_mach_info::float_format flt_fmt = oct_mach_info::native); static octave_stream - create (const std::string& n, FILE *f = 0, ios::openmode arg_md = ios::in, + create (const std::string& n, FILE *f = 0, + std::ios::openmode arg_md = std::ios::in, oct_mach_info::float_format flt_fmt = oct_mach_info::native); // Return non-zero if EOF has been reached on this stream. @@ -126,12 +127,13 @@ public: octave_ostdiostream (const std::string& n, FILE *f = 0, - ios::openmode arg_md = ios::out, + std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native); static octave_stream - create (const std::string& n, FILE *f = 0, ios::openmode arg_md = ios::out, + create (const std::string& n, FILE *f = 0, + std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native); // Return non-zero if EOF has been reached on this stream.
--- a/src/oct-stream.h +++ b/src/oct-stream.h @@ -227,7 +227,7 @@ public: - octave_base_stream (ios::openmode arg_md = ios::in|ios::out, + octave_base_stream (std::ios::openmode arg_md = std::ios::in|std::ios::out, oct_mach_info::float_format ff = oct_mach_info::native) : count (0), md (arg_md), flt_fmt (ff), fail (false), open_state (true) { } @@ -239,7 +239,7 @@ // Position a stream at OFFSET relative to ORIGIN. - virtual int seek (streamoff offset, ios::seek_dir origin) = 0; + virtual int seek (streamoff offset, std::ios::seek_dir origin) = 0; // Return current stream position. @@ -299,7 +299,7 @@ int count; // The permission bits for the file. Should be some combination of - // ios::open_mode bits. + // std::ios::open_mode bits. int md; // Data format. @@ -398,7 +398,7 @@ std::string gets (int max_len, bool& err); std::string gets (const octave_value& max_len, bool& err); - int seek (streamoff offset, ios::seek_dir origin); + int seek (streamoff offset, std::ios::seek_dir origin); int seek (const octave_value& offset, const octave_value& origin); long tell (void) const;
--- a/src/oct-strstrm.cc +++ b/src/oct-strstrm.cc @@ -29,7 +29,7 @@ // Position a stream at OFFSET relative to ORIGIN. int -octave_base_strstream::seek (streamoff offset, ios::seek_dir origin) +octave_base_strstream::seek (streamoff offset, std::ios::seek_dir origin) { int retval = -1; @@ -64,7 +64,7 @@ if (sb) { - retval = static_cast<long> (sb->seekoff (0, ios::cur)); + retval = static_cast<long> (sb->seekoff (0, std::ios::cur)); if (bad ()) retval = -1; @@ -75,21 +75,21 @@ } octave_stream -octave_istrstream::create (const char *data, ios::openmode arg_md, +octave_istrstream::create (const char *data, std::ios::openmode arg_md, oct_mach_info::float_format flt_fmt) { return octave_stream (new octave_istrstream (data, arg_md, flt_fmt)); } octave_stream -octave_istrstream::create (const std::string& data, ios::openmode arg_md, +octave_istrstream::create (const std::string& data, std::ios::openmode arg_md, oct_mach_info::float_format flt_fmt) { return octave_stream (new octave_istrstream (data, arg_md, flt_fmt)); } octave_stream -octave_ostrstream::create (ios::openmode arg_md, +octave_ostrstream::create (std::ios::openmode arg_md, oct_mach_info::float_format flt_fmt) { return octave_stream (new octave_ostrstream (arg_md, flt_fmt));
--- a/src/ov-base.cc +++ b/src/ov-base.cc @@ -61,7 +61,7 @@ } octave_value_list -octave_base_value::do_index_op (int, const octave_value_list&) +octave_base_value::do_multi_index_op (int, const octave_value_list&) { std::string nm = type_name (); error ("can't perform indexing operations for %s type", nm.c_str ());
--- a/src/ov-base.h +++ b/src/ov-base.h @@ -72,7 +72,8 @@ octave_value do_index_op (const octave_value_list& idx); - octave_value_list do_index_op (int nargout, const octave_value_list& idx); + octave_value_list + do_multi_index_op (int nargout, const octave_value_list& idx); idx_vector index_vector (void) const;
--- a/src/ov-builtin.cc +++ b/src/ov-builtin.cc @@ -52,7 +52,7 @@ } octave_value_list -octave_builtin::do_index_op (int nargout, const octave_value_list& args) +octave_builtin::do_multi_index_op (int nargout, const octave_value_list& args) { octave_value_list retval;
--- a/src/ov-builtin.h +++ b/src/ov-builtin.h @@ -54,7 +54,8 @@ bool is_builtin_function (void) const { return true; } - octave_value_list do_index_op (int nargout, const octave_value_list& args); + octave_value_list + do_multi_index_op (int nargout, const octave_value_list& args); protected:
--- a/src/ov-fcn.h +++ b/src/ov-fcn.h @@ -60,7 +60,7 @@ virtual bool is_dynamically_loaded_function (void) const { return false; } - virtual bool is_system_fcn_file (void) { return false; } + virtual bool is_system_fcn_file (void) const { return false; } virtual std::string fcn_file_name (void) const { return std::string (); }
--- a/src/ov-mapper.cc +++ b/src/ov-mapper.cc @@ -231,7 +231,7 @@ } octave_value_list -octave_mapper::do_index_op (int, const octave_value_list& args) +octave_mapper::do_multi_index_op (int, const octave_value_list& args) { octave_value retval;
--- a/src/ov-mapper.h +++ b/src/ov-mapper.h @@ -63,7 +63,8 @@ octave_function *function_value (bool) { return this; } - octave_value_list do_index_op (int nargout, const octave_value_list& args); + octave_value_list + do_multi_index_op (int nargout, const octave_value_list& args); private:
--- a/src/ov-usr-fcn.cc +++ b/src/ov-usr-fcn.cc @@ -254,7 +254,8 @@ } octave_value_list -octave_user_function::do_index_op (int nargout, const octave_value_list& args) +octave_user_function::do_multi_index_op (int nargout, + const octave_value_list& args) { octave_value_list retval;
--- a/src/ov-usr-fcn.h +++ b/src/ov-usr-fcn.h @@ -113,7 +113,8 @@ void clear_args_passed (void) { args_passed = octave_value_list (); } - octave_value_list do_index_op (int nargout, const octave_value_list& args); + octave_value_list + do_multi_index_op (int nargout, const octave_value_list& args); void traceback_error (void);
--- a/src/ov.cc +++ b/src/ov.cc @@ -550,9 +550,9 @@ } octave_value_list -octave_value::do_index_op (int nargout, const octave_value_list& idx) +octave_value::do_multi_index_op (int nargout, const octave_value_list& idx) { - return rep->do_index_op (nargout, idx); + return rep->do_multi_index_op (nargout, idx); } static void
--- a/src/ov.h +++ b/src/ov.h @@ -237,7 +237,7 @@ { return rep->do_index_op (idx); } virtual octave_value_list - do_index_op (int nargout, const octave_value_list& idx); + do_multi_index_op (int nargout, const octave_value_list& idx); void assign (assign_op, const octave_value& rhs);
--- a/src/pager.cc +++ b/src/pager.cc @@ -241,7 +241,7 @@ { do_sync (buf, len, bypass_pager); - seekoff (0, ios::beg); + seekoff (0, std::ios::beg); octave_diary.write (buf, len); } @@ -271,7 +271,7 @@ external_diary_file.write (eback (), len); } - seekoff (0, ios::beg); + seekoff (0, std::ios::beg); return 0; } @@ -381,7 +381,7 @@ { close_diary_file (); - external_diary_file.open (diary_file.c_str (), ios::app); + external_diary_file.open (diary_file.c_str (), std::ios::app); if (! external_diary_file) error ("diary: can't open diary file `%s'", diary_file.c_str ());
--- a/src/parse.y +++ b/src/parse.y @@ -3169,7 +3169,7 @@ octave_function *fcn = is_valid_function (name, "feval", 1); if (fcn) - retval = fcn->do_index_op (nargout, args); + retval = fcn->do_multi_index_op (nargout, args); return retval; }
--- a/src/procstream.cc +++ b/src/procstream.cc @@ -35,7 +35,7 @@ pb_init (); if (! pb.open (command, mode)) - set (ios::badbit); + set (std::ios::badbit); } void @@ -44,7 +44,7 @@ clear (); if (! pb.open (command, mode)) - set (ios::badbit); + set (std::ios::badbit); } int @@ -55,7 +55,7 @@ if (is_open ()) { if (! pb.close ()) - set (ios::failbit); + set (std::ios::failbit); status = pb.wait_status (); }
--- a/src/procstream.h +++ b/src/procstream.h @@ -36,7 +36,7 @@ #include "oct-procbuf.h" class -procstreambase : virtual public ios +procstreambase : virtual public std::ios { public: @@ -72,12 +72,12 @@ iprocstream (void) : procstreambase () { } - iprocstream (const char *name, int mode=ios::in) + iprocstream (const char *name, int mode = std::ios::in) : procstreambase(name, mode) { } ~iprocstream (void) { } - void open (const char *name, int mode=ios::in) + void open (const char *name, int mode = std::ios::in) { procstreambase::open (name, mode); } private: @@ -94,12 +94,12 @@ oprocstream (void) : procstreambase () { } - oprocstream (const char *name, int mode=ios::out) + oprocstream (const char *name, int mode = std::ios::out) : procstreambase(name, mode) { } ~oprocstream (void) { } - void open (const char *name, int mode=ios::out) + void open (const char *name, int mode = std::ios::out) { procstreambase::open(name, mode); } private:
--- a/src/pt-id.cc +++ b/src/pt-id.cc @@ -166,7 +166,7 @@ { octave_value_list tmp_args; - retval = val.do_index_op (nargout, tmp_args); + retval = val.do_multi_index_op (nargout, tmp_args); } else {
--- a/src/pt-idx.cc +++ b/src/pt-idx.cc @@ -85,7 +85,7 @@ if (tmp.is_constant ()) retval = tmp.do_index_op (args); else - retval = tmp.do_index_op (nargout, args); + retval = tmp.do_multi_index_op (nargout, args); } else eval_error ();
--- a/src/symtab.cc +++ b/src/symtab.cc @@ -95,7 +95,7 @@ if (pr_orig_txt && ! fn.empty ()) { - std::ifstream fs (fn.c_str (), ios::in); + std::ifstream fs (fn.c_str (), std::ios::in); if (fs) { @@ -453,9 +453,9 @@ << (hides_fcn () ? "f" : (hides_builtin () ? "F" : "-")) #endif << " " - << setiosflags (ios::left) << setw (24) << type_name () . c_str (); + << setiosflags (std::ios::left) << setw (24) << type_name () . c_str (); - os << resetiosflags (ios::left); + os << resetiosflags (std::ios::left); int nr = rows (); int nc = columns (); @@ -463,14 +463,14 @@ if (nr < 0) os << " -"; else - os << setiosflags (ios::right) << setw (7) << nr; + os << setiosflags (std::ios::right) << setw (7) << nr; if (nc < 0) os << " -"; else - os << setiosflags (ios::right) << setw (7) << nc; + os << setiosflags (std::ios::right) << setw (7) << nc; - os << resetiosflags (ios::right); + os << resetiosflags (std::ios::right); os << " " << name () << "\n"; }