Mercurial > octave

diff libinterp/corefcn/oct-iostrm.h @ 27172:b0abae0bd94b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fixes * oct-fstrm.cc, oct-fstrm.h, oct-iostrm.cc, oct-iostrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, procstream.cc, procstream.h: Use m_ prefix for member variable names and other minor style fixes.
author John W. Eaton <jwe@octave.org>
date Tue, 11 Jun 2019 12:53:55 -0500
parents 00f796120a6d
children b442ec6dda5c
line wrap: on
line diff
--- a/libinterp/corefcn/oct-iostrm.h	Tue Jun 11 12:50:34 2019 -0500
+++ b/libinterp/corefcn/oct-iostrm.h	Tue Jun 11 12:53:55 2019 -0500
@@ -38,7 +38,7 @@
                         std::ios::openmode m = std::ios::in | std::ios::out,
                         octave::mach_info::float_format ff
                           = octave::mach_info::native_float_format ())
-    : octave::base_stream (m, ff), nm (n) { }
+    : octave::base_stream (m, ff), m_name (n) { }
 
   // No copying!
 
@@ -66,7 +66,7 @@
 
   // The name of the file.
 
-  std::string name (void) const { return nm; }
+  std::string name (void) const { return m_name; }
 
 protected:
 
@@ -74,7 +74,7 @@
 
 private:
 
-  std::string nm;
+  std::string m_name;
 
   virtual const char * stream_type (void) const = 0;
 };
@@ -87,7 +87,7 @@
   octave_istream (std::istream *arg = nullptr, const std::string& n = "")
     : octave_base_iostream (n, std::ios::in,
                             octave::mach_info::native_float_format ()),
-      is (arg)
+      m_istream (arg)
   { }
 
   static octave::stream
@@ -97,7 +97,7 @@
 
   bool eof (void) const;
 
-  std::istream * input_stream (void) { return is; }
+  std::istream * input_stream (void) { return m_istream; }
 
   std::ostream * output_stream (void) { return nullptr; }
 
@@ -107,7 +107,7 @@
 
 private:
 
-  std::istream *is;
+  std::istream *m_istream;
 
   const char * stream_type (void) const { return "octave_istream"; }
 
@@ -126,7 +126,7 @@
   octave_ostream (std::ostream *arg, const std::string& n = "")
     : octave_base_iostream (n, std::ios::out,
                             octave::mach_info::native_float_format ()),
-      os (arg)
+      m_ostream (arg)
   { }
 
   static octave::stream
@@ -138,7 +138,7 @@
 
   std::istream * input_stream (void) { return nullptr; }
 
-  std::ostream * output_stream (void) { return os; }
+  std::ostream * output_stream (void) { return m_ostream; }
 
 protected:
 
@@ -146,7 +146,7 @@
 
 private:
 
-  std::ostream *os;
+  std::ostream *m_ostream;
 
   const char * stream_type (void) const { return "octave_ostream"; }