Mercurial > octave

changeset 23675:f71c0195b19d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move octave_preserve_stream_state to octave namespace * octave-preserve-stream-state.h (preserve_stream_state): Move inside octave namespace and rename from octave_preserve_stream_state. Change all uses.
author John W. Eaton <jwe@octave.org>
date Thu, 22 Jun 2017 08:19:10 -0400
parents 81b141d265a3
children e719f04a5707
files libinterp/corefcn/debug.cc libinterp/corefcn/pr-output.cc libinterp/corefcn/variables.cc libinterp/octave-value/ov-base-sparse.cc liboctave/util/octave-preserve-stream-state.h
diffstat 5 files changed, 47 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/debug.cc	Thu Jun 22 08:09:50 2017 -0400
+++ b/libinterp/corefcn/debug.cc	Thu Jun 22 08:19:10 2017 -0400
@@ -873,7 +873,7 @@
 
       if (nframes_to_display > 0)
         {
-          octave_preserve_stream_state stream_state (os);
+          octave::preserve_stream_state stream_state (os);
 
           os << "stopped in:\n\n";
 
--- a/libinterp/corefcn/pr-output.cc	Thu Jun 22 08:09:50 2017 -0400
+++ b/libinterp/corefcn/pr-output.cc	Thu Jun 22 08:19:10 2017 -0400
@@ -286,7 +286,7 @@
 std::ostream&
 operator << (std::ostream& os, const pr_engineering_float& pef)
 {
-  octave_preserve_stream_state stream_state (os);
+  octave::preserve_stream_state stream_state (os);
 
   if (pef.f.fw >= 0)
     os << std::setw (pef.f.fw - pef.f.ex);
@@ -329,7 +329,7 @@
 std::ostream&
 operator << (std::ostream& os, const pr_formatted_float& pff)
 {
-  octave_preserve_stream_state stream_state (os);
+  octave::preserve_stream_state stream_state (os);
 
   if (pff.f.fw >= 0)
     os << std::setw (pff.f.fw);
@@ -469,7 +469,7 @@
 std::ostream&
 operator << (std::ostream& os, const pr_rational_float& prf)
 {
-  octave_preserve_stream_state stream_state (os);
+  octave::preserve_stream_state stream_state (os);
 
   int fw = (rat_string_len > 0 ? rat_string_len : prf.f.fw);
   std::string s = rational_approx (prf.val, fw);
@@ -1444,7 +1444,7 @@
 
       if (hex_format)
         {
-          octave_preserve_stream_state stream_state (os);
+          octave::preserve_stream_state stream_state (os);
 
           equiv tmp;
           tmp.d = d;
@@ -1502,7 +1502,7 @@
         }
       else if (octave::math::isna (d))
         {
-          octave_preserve_stream_state stream_state (os);
+          octave::preserve_stream_state stream_state (os);
 
           if (fw > 0)
             os << std::setw (fw) << "NA";
@@ -1513,7 +1513,7 @@
         os << pr_rational_float (*fmt, d);
       else if (octave::math::isinf (d))
         {
-          octave_preserve_stream_state stream_state (os);
+          octave::preserve_stream_state stream_state (os);
 
           const char *s;
           if (d < 0.0)
@@ -1528,7 +1528,7 @@
         }
       else if (octave::math::isnan (d))
         {
-          octave_preserve_stream_state stream_state (os);
+          octave::preserve_stream_state stream_state (os);
 
           if (fw > 0)
             os << std::setw (fw) << "NaN";
@@ -1636,7 +1636,7 @@
 {
   if (Vfixed_point_format && ! print_g && scale != 1.0)
     {
-      octave_preserve_stream_state stream_state (os);
+      octave::preserve_stream_state stream_state (os);
 
       os << "  "
          << std::setw (8) << std::setprecision (1)
@@ -1655,7 +1655,7 @@
 {
   if (total_width > max_width && Vsplit_long_rows)
     {
-      octave_preserve_stream_state stream_state (os);
+      octave::preserve_stream_state stream_state (os);
 
       if (col != 0)
         {
@@ -1821,7 +1821,7 @@
         }
       else
         {
-          octave_preserve_stream_state stream_state (os);
+          octave::preserve_stream_state stream_state (os);
 
           pr_scale_header (os, scale);
 
@@ -1952,7 +1952,7 @@
         }
       else
         {
-          octave_preserve_stream_state stream_state (os);
+          octave::preserve_stream_state stream_state (os);
 
           os << "Diagonal Matrix\n";
           if (! Vcompact_format)
@@ -2239,7 +2239,7 @@
         }
       else
         {
-          octave_preserve_stream_state stream_state (os);
+          octave::preserve_stream_state stream_state (os);
 
           pr_scale_header (os, scale);
 
@@ -2372,7 +2372,7 @@
         }
       else
         {
-          octave_preserve_stream_state stream_state (os);
+          octave::preserve_stream_state stream_state (os);
 
           os << "Diagonal Matrix\n";
           if (! Vcompact_format)
@@ -2520,7 +2520,7 @@
         }
       else
         {
-          octave_preserve_stream_state stream_state (os);
+          octave::preserve_stream_state stream_state (os);
 
           os << "Permutation Matrix\n";
           if (! Vcompact_format)
@@ -2688,7 +2688,7 @@
         }
       else
         {
-          octave_preserve_stream_state stream_state (os);
+          octave::preserve_stream_state stream_state (os);
 
           int column_width = fw + 2;
           octave_idx_type total_width = num_elem * column_width;
@@ -2985,7 +2985,7 @@
 
   if (hex_format)
     {
-      octave_preserve_stream_state stream_state (os);
+      octave::preserve_stream_state stream_state (os);
 
       os.flags (std::ios::right | std::ios::hex);
 
@@ -3023,7 +3023,7 @@
     }
   else
     {
-      octave_preserve_stream_state stream_state (os);
+      octave::preserve_stream_state stream_state (os);
 
       os << std::setw (fw)
          << typename octave_print_conv<T>::print_conv_type (d);
@@ -3319,7 +3319,7 @@
             }
           else
             {
-              octave_preserve_stream_state stream_state (os);
+              octave::preserve_stream_state stream_state (os);
 
               octave_idx_type n_rows = page.rows ();
               octave_idx_type n_cols = page.cols ();
--- a/libinterp/corefcn/variables.cc	Thu Jun 22 08:09:50 2017 -0400
+++ b/libinterp/corefcn/variables.cc	Thu Jun 22 08:19:10 2017 -0400
@@ -1070,7 +1070,7 @@
   std::list<whos_parameter>::iterator i = params.begin ();
   std::ostringstream param_buf;
 
-  octave_preserve_stream_state stream_state (os);
+  octave::preserve_stream_state stream_state (os);
 
   while (i != params.end ())
     {
@@ -1208,7 +1208,7 @@
 
       std::list<whos_parameter>::const_iterator i = params.begin ();
 
-      octave_preserve_stream_state stream_state (os);
+      octave::preserve_stream_state stream_state (os);
 
       while (i != params.end ())
         {
--- a/libinterp/octave-value/ov-base-sparse.cc	Thu Jun 22 08:09:50 2017 -0400
+++ b/libinterp/octave-value/ov-base-sparse.cc	Thu Jun 22 08:19:10 2017 -0400
@@ -350,7 +350,7 @@
 octave_base_sparse<T>::print_raw (std::ostream& os,
                                   bool pr_as_read_syntax) const
 {
-  octave_preserve_stream_state stream_state (os);
+  octave::preserve_stream_state stream_state (os);
 
   octave_idx_type nr = matrix.rows ();
   octave_idx_type nc = matrix.cols ();
--- a/liboctave/util/octave-preserve-stream-state.h	Thu Jun 22 08:09:50 2017 -0400
+++ b/liboctave/util/octave-preserve-stream-state.h	Thu Jun 22 08:19:10 2017 -0400
@@ -27,31 +27,34 @@
 
 #include <ios>
 
-class
-octave_preserve_stream_state
+namespace octave
 {
-public:
-
-  octave_preserve_stream_state (std::ios& s)
-    : stream (s), oflags (s.flags ()), oprecision (s.precision ()),
-      owidth (s.width ()), ofill (s.fill ())
-  { }
-
-  ~octave_preserve_stream_state (void)
+  class
+  preserve_stream_state
   {
-    stream.flags (oflags);
-    stream.precision (oprecision);
-    stream.width (owidth);
-    stream.fill (ofill);
-  }
+  public:
+
+    preserve_stream_state (std::ios& s)
+      : stream (s), oflags (s.flags ()), oprecision (s.precision ()),
+        owidth (s.width ()), ofill (s.fill ())
+    { }
 
-private:
+    ~preserve_stream_state (void)
+    {
+      stream.flags (oflags);
+      stream.precision (oprecision);
+      stream.width (owidth);
+      stream.fill (ofill);
+    }
 
-  std::ios& stream;
-  std::ios::fmtflags oflags;
-  std::streamsize oprecision;
-  int owidth;
-  char ofill;
-};
+  private:
+
+    std::ios& stream;
+    std::ios::fmtflags oflags;
+    std::streamsize oprecision;
+    int owidth;
+    char ofill;
+  };
+}
 
 #endif