Mercurial > octave

diff libinterp/corefcn/oct-prcstrm.h @ 29991:3988112c7116

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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-prcstrm.h	Mon Aug 16 22:28:30 2021 -0400
+++ b/libinterp/corefcn/oct-prcstrm.h	Tue Aug 17 11:17:36 2021 -0400
@@ -33,8 +33,15 @@
 // FIXME: why don't these classes use iprocstream and oprocstream,
 //        which in turn use the octave_procbuf class?
 
+// Note: Even though these classes are now inside the octave namespace,
+// we can't rename them to iprocstream and oprocstream because we
+// already have classes with those names (see procstream.h).  We need to
+// find a way to resolve this naming issue.
+
+OCTAVE_NAMESPACE_BEGIN
+
 class
-octave_iprocstream : public octave_stdiostream
+octave_iprocstream : public octave::stdiostream
 {
 public:
 
@@ -62,7 +69,7 @@
 };
 
 class
-octave_oprocstream : public octave_stdiostream
+octave_oprocstream : public octave::stdiostream
 {
 public:
 
@@ -89,4 +96,16 @@
   ~octave_oprocstream (void);
 };
 
+OCTAVE_NAMESPACE_END
+
+#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
+
+OCTAVE_DEPRECATED (7, "use 'octave::octave_iprocstream' instead")
+typedef octave::octave_iprocstream octave_iprocstream;
+
+OCTAVE_DEPRECATED (7, "use 'octave::octave_oprocstream' instead")
+typedef octave::octave_oprocstream octave_oprocstream;
+
 #endif
+
+#endif