Mercurial > octave
diff libinterp/corefcn/oct-strstrm.cc @ 29991:3988112c7116
move i/o stream classes inside octave namespace
* c-file-ptr-stream.h, c-file-ptr-stream.cc, file-io.cc, oct-fstrm.cc,
oct-fstrm.h, oct-iostrm.cc, oct-iostrm.h, oct-prcstrm.cc,
oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-stdstrm.h,
oct-stream.cc, oct-strstrm.cc, oct-strstrm.h, procstream.cc,
procstream.h: Move classes inside octave namespace. Change all
uses. Provide deprecated typedefs to preserve old names where
possible.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 17 Aug 2021 11:17:36 -0400 |
| parents | 0a5b15007766 |
| children | a61e1a0f6024 |
line wrap: on
line diff
--- a/libinterp/corefcn/oct-strstrm.cc Mon Aug 16 22:28:30 2021 -0400 +++ b/libinterp/corefcn/oct-strstrm.cc Tue Aug 17 11:17:36 2021 -0400 @@ -29,12 +29,14 @@ #include "oct-strstrm.h" +OCTAVE_NAMESPACE_BEGIN + // Position a stream at OFFSET relative to ORIGIN. int -octave_base_strstream::seek (off_t, int) +base_strstream::seek (off_t, int) { - // Note: error is inherited from octave::base_stream, not ::error. + // Note: error is inherited from base_stream, not ::error. // This error function does not halt execution so "return ..." must exist. error ("fseek: invalid operation"); return -1; @@ -43,37 +45,36 @@ // Return current stream position. off_t -octave_base_strstream::tell (void) +base_strstream::tell (void) { - // Note: error is inherited from octave::base_stream, not ::error. + // Note: error is inherited from base_stream, not ::error. // This error function does not halt execution so "return ..." must exist. error ("ftell: invalid operation"); return -1; } -octave::stream -octave_istrstream::create (const char *data, std::ios::openmode arg_md, - octave::mach_info::float_format flt_fmt, - const std::string& encoding) +stream +istrstream::create (const char *data, std::ios::openmode arg_md, + mach_info::float_format flt_fmt, + const std::string& encoding) { - return octave::stream (new octave_istrstream (data, arg_md, flt_fmt, - encoding)); + return stream (new istrstream (data, arg_md, flt_fmt, encoding)); } -octave::stream -octave_istrstream::create (const std::string& data, std::ios::openmode arg_md, - octave::mach_info::float_format flt_fmt, +stream +istrstream::create (const std::string& data, std::ios::openmode arg_md, + mach_info::float_format flt_fmt, const std::string& encoding) { - return octave::stream (new octave_istrstream (data, arg_md, flt_fmt, - encoding)); + return stream (new istrstream (data, arg_md, flt_fmt, encoding)); } -octave::stream -octave_ostrstream::create (std::ios::openmode arg_md, - octave::mach_info::float_format flt_fmt, +stream +ostrstream::create (std::ios::openmode arg_md, + mach_info::float_format flt_fmt, const std::string& encoding) { - return octave::stream (new octave_ostrstream (arg_md, flt_fmt, - encoding)); + return stream (new ostrstream (arg_md, flt_fmt, encoding)); } + +OCTAVE_NAMESPACE_END