Mercurial > octave
diff libinterp/corefcn/oct-strstrm.h @ 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 | 796f54d4ddbf |
line wrap: on
line diff
--- a/libinterp/corefcn/oct-strstrm.h Mon Aug 16 22:28:30 2021 -0400 +++ b/libinterp/corefcn/oct-strstrm.h Tue Aug 17 11:17:36 2021 -0400 @@ -33,26 +33,28 @@ #include "oct-stream.h" +OCTAVE_NAMESPACE_BEGIN + class -octave_base_strstream : public octave::base_stream +base_strstream : public base_stream { public: - octave_base_strstream (std::ios::openmode m = std::ios::out, - octave::mach_info::float_format ff - = octave::mach_info::native_float_format (), - const std::string& encoding = "utf-8") - : octave::base_stream (m, ff, encoding) { } + base_strstream (std::ios::openmode m = std::ios::out, + mach_info::float_format ff + = mach_info::native_float_format (), + const std::string& encoding = "utf-8") + : base_stream (m, ff, encoding) { } // No copying! - octave_base_strstream (const octave_base_strstream&) = delete; + base_strstream (const base_strstream&) = delete; - octave_base_strstream& operator = (const octave_base_strstream&) = delete; + base_strstream& operator = (const base_strstream&) = delete; protected: - ~octave_base_strstream (void) = default; + ~base_strstream (void) = default; public: @@ -76,47 +78,43 @@ }; class -octave_istrstream : public octave_base_strstream +istrstream : public base_strstream { public: - octave_istrstream (const char *data, - std::ios::openmode arg_md = std::ios::out, - octave::mach_info::float_format ff - = octave::mach_info::native_float_format (), - const std::string& encoding = "utf-8") - : octave_base_strstream (arg_md, ff, encoding), m_istream (data) { } + istrstream (const char *data, + std::ios::openmode arg_md = std::ios::out, + mach_info::float_format ff = mach_info::native_float_format (), + const std::string& encoding = "utf-8") + : base_strstream (arg_md, ff, encoding), m_istream (data) { } - octave_istrstream (const std::string& data, - std::ios::openmode arg_md = std::ios::out, - octave::mach_info::float_format ff - = octave::mach_info::native_float_format (), - const std::string& encoding = "utf-8") - : octave_base_strstream (arg_md, ff, encoding), m_istream (data) { } + istrstream (const std::string& data, + std::ios::openmode arg_md = std::ios::out, + mach_info::float_format ff = mach_info::native_float_format (), + const std::string& encoding = "utf-8") + : base_strstream (arg_md, ff, encoding), m_istream (data) { } // No copying! - octave_istrstream (const octave_istrstream&) = delete; + istrstream (const istrstream&) = delete; - octave_istrstream& operator = (const octave_istrstream&) = delete; + istrstream& operator = (const istrstream&) = delete; protected: - ~octave_istrstream (void) = default; + ~istrstream (void) = default; public: - static octave::stream + static stream create (const char *data, std::ios::openmode arg_md = std::ios::out, - octave::mach_info::float_format ff - = octave::mach_info::native_float_format (), + mach_info::float_format ff = mach_info::native_float_format (), const std::string& encoding = "utf-8"); - static octave::stream + static stream create (const std::string& data, std::ios::openmode arg_md = std::ios::out, - octave::mach_info::float_format ff - = octave::mach_info::native_float_format (), + mach_info::float_format ff = mach_info::native_float_format (), const std::string& encoding = "utf-8"); // Return nonzero if EOF has been reached on this stream. @@ -144,32 +142,30 @@ }; class -octave_ostrstream : public octave_base_strstream +ostrstream : public base_strstream { public: - octave_ostrstream (std::ios::openmode arg_md = std::ios::out, - octave::mach_info::float_format ff - = octave::mach_info::native_float_format (), - const std::string& encoding = "utf-8") - : octave_base_strstream (arg_md, ff, encoding), m_ostream () { } + ostrstream (std::ios::openmode arg_md = std::ios::out, + mach_info::float_format ff = mach_info::native_float_format (), + const std::string& encoding = "utf-8") + : base_strstream (arg_md, ff, encoding), m_ostream () { } // No copying! - octave_ostrstream (const octave_ostrstream&) = delete; + ostrstream (const ostrstream&) = delete; - octave_ostrstream& operator = (const octave_ostrstream&) = delete; + ostrstream& operator = (const ostrstream&) = delete; protected: - ~octave_ostrstream (void) = default; + ~ostrstream (void) = default; public: - static octave::stream + static stream create (std::ios::openmode arg_md = std::ios::out, - octave::mach_info::float_format ff - = octave::mach_info::native_float_format (), + mach_info::float_format ff = mach_info::native_float_format (), const std::string& encoding = "utf-8"); // Return nonzero if EOF has been reached on this stream. @@ -196,4 +192,19 @@ std::ostringstream m_ostream; }; +OCTAVE_NAMESPACE_END + +#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS) + +OCTAVE_DEPRECATED (7, "use 'octave::base_strstream' instead") +typedef octave::base_strstream octave_base_strstream; + +OCTAVE_DEPRECATED (7, "use 'octave::istrstream' instead") +typedef octave::istrstream octave_istrstream; + +OCTAVE_DEPRECATED (7, "use 'octave::ostrstream' instead") +typedef octave::ostrstream octave_ostrstream; + #endif + +#endif