Mercurial > octave

diff libinterp/corefcn/oct-iostrm.cc @ 23059:b98ebcd7f11c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move some octave stream classes into octave namespace * oct-stream.h, oct-stream.cc (base_stream, stream, stream_list): Move inside octave namespace and rename without octave_ prefix. Change all uses.
author John W. Eaton <jwe@octave.org>
date Tue, 17 Jan 2017 13:56:16 -0500
parents 3a2b891d0b33
children ef4d915df748
line wrap: on
line diff
--- a/libinterp/corefcn/oct-iostrm.cc	Tue Jan 17 11:42:25 2017 -0500
+++ b/libinterp/corefcn/oct-iostrm.cc	Tue Jan 17 13:56:16 2017 -0500
@@ -24,6 +24,8 @@
 #  include "config.h"
 #endif
 
+#include <iostream>
+
 #include "error.h"
 #include "oct-iostrm.h"
 
@@ -69,10 +71,10 @@
   return is && is->eof ();
 }
 
-octave_stream
+octave::stream
 octave_istream::create (std::istream *arg, const std::string& n)
 {
-  return octave_stream (new octave_istream (arg, n));
+  return octave::stream (new octave_istream (arg, n));
 }
 
 // Return nonzero if EOF has been reached on this stream.
@@ -83,9 +85,9 @@
   return os && os->eof ();
 }
 
-octave_stream
+octave::stream
 octave_ostream::create (std::ostream *arg, const std::string& n)
 {
-  return octave_stream (new octave_ostream (arg, n));
+  return octave::stream (new octave_ostream (arg, n));
 }