Mercurial > octave-nkf

changeset 6974:9e32bb109980

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-10-08 11:06:47 by jwe]
author jwe
date Mon, 08 Oct 2007 11:06:48 +0000
parents 6fcc2f5b2c7d
children 0d11a12643f1
files src/ChangeLog src/load-save.cc src/load-save.h src/ls-oct-ascii.cc src/ls-oct-ascii.h src/ov-base-int.cc src/ov-base-int.h src/ov-base-sparse.cc src/ov-base-sparse.h src/ov-base.cc src/ov-base.h src/ov-bool-mat.cc src/ov-bool-mat.h src/ov-bool.cc src/ov-bool.h src/ov-cell.cc src/ov-cell.h src/ov-complex.cc src/ov-complex.h src/ov-cx-mat.cc src/ov-cx-mat.h src/ov-fcn-handle.cc src/ov-fcn-handle.h src/ov-fcn-inline.cc src/ov-fcn-inline.h src/ov-list.cc src/ov-list.h src/ov-range.cc src/ov-range.h src/ov-re-mat.cc src/ov-re-mat.h src/ov-scalar.cc src/ov-scalar.h src/ov-str-mat.cc src/ov-str-mat.h src/ov-struct.cc src/ov-struct.h src/ov.h
diffstat 38 files changed, 82 insertions(+), 92 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ChangeLog	Mon Oct 08 11:06:48 2007 +0000
@@ -1,5 +1,34 @@
 2007-10-08  John W. Eaton  <jwe@octave.org>
 
+	* load-save.cc 	(save_vars, dump_octave_core):
+	Don't pass INFNAN_WARNED to do_save.
+	(do_save): Delete unused arg, INFNAN_WARNED.
+	Don't pass INFNAN_WARNED to save_ascii_data.
+	* ls-oct-ascii.cc (save_ascii_data_for_plotting):
+	Don't pass INFNAN_WARNED to save_ascii.
+	(save_ascii_data): Delete unused arg, INFNAN_WARNED.
+
+	* ov.h (octave_value::save_ascii): Delete unused arg, INFNAN_WARNED.
+	* ov-base-int.cc (octave_base_int_matrix<T>::save_ascii,
+	octave_base_int_scalar<T>::save_ascii): Likewise.
+	* ov-base-sparse.cc (octave_base_sparse<T>::save_ascii): Likewise.
+	* ov-base.cc (octave_base_value::save_ascii): Likewise.
+	* ov-bool-mat.cc (octave_bool_matrix::save_ascii): Likewise.
+	* ov-bool.cc (octave_bool::save_ascii): Likewise.
+	* ov-cell.cc (octave_cell::save_ascii): Likewise.
+	* ov-fcn-handle.cc (octave_fcn_handle::save_ascii): Likewise.
+	* ov-fcn-inline.cc (octave_fcn_inline::save_ascii): Likewise.
+	* ov-list.cc (octave_list::save_ascii): Likewise.
+	* ov-struct.cc (octave_struct::save_ascii): Likewise.
+	* ov-str-mat.cc (octave_char_matrix_str::save_ascii): Likewise.
+	* ov-range.cc (octave_range::save_ascii): Likewise.
+
+	* ov-scalar.cc (octave_scalar::save_ascii): Remove warning about
+	reloading inf/nan values.  Delete unused arg, INFNAN_WARNED.
+	* ov-complex.cc (octave_complex::save_ascii): Likewise.
+	* ov-re-mat.cc (octave_matrix::save_ascii): Likewise.
+	* ov-cx-mat.cc (octave_complex_matrix::save_ascii): Likewise.
+
 	* ov-fcn-inline.cc (Finline): Use DEFUNX instead of DEFUN.
 
 2007-10-08  Michael Goffioul <michael.goffioul@gmail.com>
--- a/src/load-save.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/load-save.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -1032,13 +1032,12 @@
 static void
 do_save (std::ostream& os, const octave_value& tc,
 	 const std::string& name, const std::string& help,
-	 int global, load_save_format fmt, bool save_as_floats,
-	 bool& infnan_warned)
+	 int global, load_save_format fmt, bool save_as_floats)
 {
   switch (fmt)
     {
     case LS_ASCII:
-      save_ascii_data (os, tc, name, infnan_warned, global, 0);
+      save_ascii_data (os, tc, name, global, 0);
       break;
 
     case LS_BINARY:
@@ -1079,7 +1078,7 @@
 
 void
 do_save (std::ostream& os, symbol_record *sr, load_save_format fmt,
-	 bool save_as_floats, bool& infnan_warned)
+	 bool save_as_floats)
 {
   if (! sr->is_variable ())
     {
@@ -1096,8 +1095,7 @@
 
       int global = sr->is_linked_to_global ();
 
-      do_save (os, tc, name, help, global, fmt, save_as_floats,
-	       infnan_warned);
+      do_save (os, tc, name, help, global, fmt, save_as_floats);
     }
 }
 
@@ -1113,11 +1111,9 @@
 
   int saved = vars.length ();
 
-  bool infnan_warned = false;
-
   for (int i = 0; i < saved; i++)
     {
-      do_save (os, vars(i), fmt, save_as_floats, infnan_warned);
+      do_save (os, vars(i), fmt, save_as_floats);
 
       if (error_state)
 	break;
@@ -1341,8 +1337,6 @@
 
   int num_to_save = vars.length ();
 
-  bool infnan_warned = false;
-
   double save_mem_size = 0;
 
   for (int i = 0; i < num_to_save; i++)
@@ -1370,8 +1364,7 @@
 
 		  int global = sr->is_linked_to_global ();
 
-		  do_save (os, tc, name, help, global, fmt, save_as_floats,
-			   infnan_warned);
+		  do_save (os, tc, name, help, global, fmt, save_as_floats);
 
 		  if (error_state)
 		    break;
--- a/src/load-save.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/load-save.h	Mon Oct 08 11:06:48 2007 +0000
@@ -60,7 +60,7 @@
 
 extern void
 do_save (std::ostream& os, symbol_record *sr, load_save_format fmt,
-	 bool save_as_floats, bool& infnan_warned);
+	 bool save_as_floats);
 
 extern void
 write_header (std::ostream& os, load_save_format format);
--- a/src/ls-oct-ascii.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ls-oct-ascii.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -321,8 +321,8 @@
 
 bool
 save_ascii_data (std::ostream& os, const octave_value& val_arg,
-		 const std::string& name, bool& infnan_warned,
-		 bool mark_as_global, int precision)
+		 const std::string& name, bool mark_as_global,
+		 int precision)
 {
   bool success = true;
 
@@ -342,7 +342,7 @@
   long old_precision = os.precision ();
   os.precision (precision);
 
-  success = val . save_ascii (os, infnan_warned);
+  success = val.save_ascii (os);
 
   os.precision (old_precision);
 
@@ -353,9 +353,7 @@
 save_ascii_data_for_plotting (std::ostream& os, const octave_value& t,
 			      const std::string& name)
 {
-  bool infnan_warned = true;
-
-  return save_ascii_data (os, t, name, infnan_warned, false, 6);
+  return save_ascii_data (os, t, name, false, 6);
 }
 
 // Maybe this should be a static function in tree-plot.cc?
--- a/src/ls-oct-ascii.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ls-oct-ascii.h	Mon Oct 08 11:06:48 2007 +0000
@@ -50,8 +50,7 @@
 
 extern OCTINTERP_API bool
 save_ascii_data (std::ostream& os, const octave_value& val_arg,
-		 const std::string& name, bool& infnan_warned,
-		 bool mark_as_global, int precision);
+		 const std::string& name, bool mark_as_global, int precision);
 
 extern OCTINTERP_API bool
 save_ascii_data_for_plotting (std::ostream& os, const octave_value& t,
--- a/src/ov-base-int.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-base-int.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -112,7 +112,7 @@
 
 template <class T>
 bool
-octave_base_int_matrix<T>::save_ascii (std::ostream& os, bool&)
+octave_base_int_matrix<T>::save_ascii (std::ostream& os)
 {
   dim_vector d = this->dims ();
 
@@ -397,7 +397,7 @@
 
 template <class T>
 bool
-octave_base_int_scalar<T>::save_ascii (std::ostream& os, bool&)
+octave_base_int_scalar<T>::save_ascii (std::ostream& os)
 {
   os << this->scalar << "\n";
   return true;
--- a/src/ov-base-int.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-base-int.h	Mon Oct 08 11:06:48 2007 +0000
@@ -69,7 +69,7 @@
 
   octave_value convert_to_str_internal (bool, bool, char type) const;
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
@@ -112,7 +112,7 @@
 
   octave_value convert_to_str_internal (bool, bool, char type) const;
 
-  bool save_ascii (std::ostream& os, bool&);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov-base-sparse.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-base-sparse.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -295,7 +295,7 @@
 
 template <class T>
 bool
-octave_base_sparse<T>::save_ascii (std::ostream& os, bool&)
+octave_base_sparse<T>::save_ascii (std::ostream& os)
 {
   dim_vector dv = this->dims ();
 
--- a/src/ov-base-sparse.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-base-sparse.h	Mon Oct 08 11:06:48 2007 +0000
@@ -141,7 +141,7 @@
 
   void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov-base.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-base.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -815,7 +815,7 @@
 }
 
 bool 
-octave_base_value::save_ascii (std::ostream&, bool&)
+octave_base_value::save_ascii (std::ostream&)
 {
   gripe_wrong_type_arg ("octave_base_value::save_ascii()", type_name ());
   return false;
--- a/src/ov-base.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-base.h	Mon Oct 08 11:06:48 2007 +0000
@@ -419,7 +419,7 @@
 
   virtual void print_info (std::ostream& os, const std::string& prefix) const;
 
-  virtual bool save_ascii (std::ostream& os, bool& infnan_warned);
+  virtual bool save_ascii (std::ostream& os);
 
   virtual bool load_ascii (std::istream& is);
 
--- a/src/ov-bool-mat.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-bool-mat.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -149,7 +149,7 @@
 }
 
 bool 
-octave_bool_matrix::save_ascii (std::ostream& os, bool& /* infnan_warned */)
+octave_bool_matrix::save_ascii (std::ostream& os)
 {
   dim_vector d = dims ();
   if (d.length () > 2)
--- a/src/ov-bool-mat.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-bool-mat.h	Mon Oct 08 11:06:48 2007 +0000
@@ -164,7 +164,7 @@
 
   void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov-bool.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-bool.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -133,7 +133,7 @@
 }
 
 bool 
-octave_bool::save_ascii (std::ostream& os, bool& /* infnan_warned */)
+octave_bool::save_ascii (std::ostream& os)
 {
   double d = double_value ();
 
--- a/src/ov-bool.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-bool.h	Mon Oct 08 11:06:48 2007 +0000
@@ -166,7 +166,7 @@
 
   octave_value convert_to_str_internal (bool pad, bool force, char type) const;
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov-cell.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-cell.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -463,7 +463,7 @@
 #define CELL_ELT_TAG "<cell-element>"
 
 bool 
-octave_cell::save_ascii (std::ostream& os, bool& infnan_warned)
+octave_cell::save_ascii (std::ostream& os)
 {
   dim_vector d = dims ();
   if (d.length () > 2)
@@ -481,8 +481,7 @@
 	  octave_value o_val = tmp.elem (i);
 
 	  // Recurse to print sub-value.
-	  bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, infnan_warned, 
-				    false, 0);
+	  bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, false, 0);
 	      
 	  if (! b)
 	    return os;
@@ -504,8 +503,7 @@
 	      octave_value o_val = tmp.elem (i, j);
 
 	      // Recurse to print sub-value.
-	      bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, 
-					infnan_warned, false, 0);
+	      bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, false, 0);
 	      
 	      if (! b)
 		return os;
--- a/src/ov-cell.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-cell.h	Mon Oct 08 11:06:48 2007 +0000
@@ -115,7 +115,7 @@
   void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
 
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov-complex.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-complex.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -176,16 +176,10 @@
 }
 
 bool 
-octave_complex::save_ascii (std::ostream& os, bool& infnan_warned)
+octave_complex::save_ascii (std::ostream& os)
 {
   Complex c = complex_value ();
 
-  if (! infnan_warned && (xisnan (c) || xisinf (c)))
-    {
-      warning ("save: Inf or NaN values may not be reloadable");
-      infnan_warned = true;
-    }
-      
   octave_write_complex (os, c);
 
   os << "\n";
--- a/src/ov-complex.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-complex.h	Mon Oct 08 11:06:48 2007 +0000
@@ -122,7 +122,7 @@
 
   void decrement (void) { scalar -= 1.0; }
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov-cx-mat.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-cx-mat.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -201,19 +201,13 @@
 }
 
 bool 
-octave_complex_matrix::save_ascii (std::ostream& os, bool& infnan_warned)
+octave_complex_matrix::save_ascii (std::ostream& os)
 {
   dim_vector d = dims ();
   if (d.length () > 2)
     {
       ComplexNDArray tmp = complex_array_value ();
 
-      if (! infnan_warned && tmp.any_element_is_inf_or_nan ())
-	{
-	  warning ("save: Inf or NaN values may not be reloadable");
-	  infnan_warned = true;
-	}
-
       os << "# ndims: " << d.length () << "\n";
 
       for (int i = 0; i < d.length (); i++)
--- a/src/ov-cx-mat.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-cx-mat.h	Mon Oct 08 11:06:48 2007 +0000
@@ -121,7 +121,7 @@
 
   void decrement (void) { matrix -= Complex (1.0); }
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov-fcn-handle.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-fcn-handle.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -261,7 +261,7 @@
 }
 
 bool
-octave_fcn_handle::save_ascii (std::ostream& os, bool& infnan_warned)
+octave_fcn_handle::save_ascii (std::ostream& os)
 {
   if (nm == "@<anonymous>")
     {
@@ -293,7 +293,7 @@
 	    {
 	      if (vars(i)->is_defined () &&
 		  ! save_ascii_data (os, vars(i)->def(), vars(i)->name(), 
-				     infnan_warned, false, 0))
+				     false, 0))
 		return os;
 	    }
 	}
--- a/src/ov-fcn-handle.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-fcn-handle.h	Mon Oct 08 11:06:48 2007 +0000
@@ -87,7 +87,7 @@
 
   std::string fcn_name (void) const { return nm; }
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov-fcn-inline.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-fcn-inline.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -110,7 +110,7 @@
 }
 
 bool
-octave_fcn_inline::save_ascii (std::ostream& os, bool&)
+octave_fcn_inline::save_ascii (std::ostream& os)
 {
   os << "# nargs: " <<  ifargs.length () << "\n";
   for (int i = 0; i < ifargs.length (); i++)
--- a/src/ov-fcn-inline.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-fcn-inline.h	Mon Oct 08 11:06:48 2007 +0000
@@ -67,7 +67,7 @@
 
   Octave_map map_value (void) const;
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov-list.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-list.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -538,7 +538,7 @@
 }
 
 bool 
-octave_list::save_ascii (std::ostream& os, bool& infnan_warned)
+octave_list::save_ascii (std::ostream& os)
 {
   octave_value_list lst = list_value ();
   os << "# length: " << lst.length () << "\n";
@@ -551,8 +551,7 @@
       buf << "_" << i;
       std::string s = buf.str ();
 
-      bool b = save_ascii_data (os, lst (i), s.c_str (), infnan_warned,
-				false, 0);
+      bool b = save_ascii_data (os, lst (i), s.c_str (), false, 0);
       
       if (! b)
 	return false;
--- a/src/ov-list.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-list.h	Mon Oct 08 11:06:48 2007 +0000
@@ -99,7 +99,7 @@
 
   bool print_name_tag (std::ostream& os, const std::string& name) const;
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov-range.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-range.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -285,7 +285,7 @@
 }
 
 bool 
-octave_range::save_ascii (std::ostream& os, bool& /* infnan_warned */)
+octave_range::save_ascii (std::ostream& os)
 {
   Range r = range_value ();
   double base = r.base ();
--- a/src/ov-range.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-range.h	Mon Oct 08 11:06:48 2007 +0000
@@ -225,7 +225,7 @@
 
   bool print_name_tag (std::ostream& os, const std::string& name) const;
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov-re-mat.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-re-mat.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -255,7 +255,7 @@
 }
 
 bool 
-octave_matrix::save_ascii (std::ostream& os, bool& infnan_warned)
+octave_matrix::save_ascii (std::ostream& os)
 {
   dim_vector d = dims ();
 
@@ -263,12 +263,6 @@
     {
       NDArray tmp = array_value ();
 
-      if (! infnan_warned && tmp.any_element_is_inf_or_nan ())
-	{
-	  warning ("save: Inf or NaN values may not be reloadable");
-	  infnan_warned = true;
-	}
-
       os << "# ndims: " << d.length () << "\n";
 
       for (int i=0; i < d.length (); i++)
--- a/src/ov-re-mat.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-re-mat.h	Mon Oct 08 11:06:48 2007 +0000
@@ -156,7 +156,7 @@
 
   void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov-scalar.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-scalar.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -156,16 +156,10 @@
 }
 
 bool 
-octave_scalar::save_ascii (std::ostream& os, bool& infnan_warned)
+octave_scalar::save_ascii (std::ostream& os)
 {
   double d = double_value ();
 
-  if (! infnan_warned && (xisnan (d) || xisinf (d)))
-    {
-      warning ("save: Inf or NaN values may not be reloadable");
-      infnan_warned = true;
-    }
-
   octave_write_double (os, d);
 
   os << "\n";
--- a/src/ov-scalar.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-scalar.h	Mon Oct 08 11:06:48 2007 +0000
@@ -194,7 +194,7 @@
 
   void decrement (void) { --scalar; }
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov-str-mat.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-str-mat.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -269,7 +269,7 @@
 }
 
 bool 
-octave_char_matrix_str::save_ascii (std::ostream& os, bool& /* infnan_warned */)
+octave_char_matrix_str::save_ascii (std::ostream& os)
 {
   dim_vector d = dims ();
   if (d.length () > 2)
--- a/src/ov-str-mat.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-str-mat.h	Mon Oct 08 11:06:48 2007 +0000
@@ -130,7 +130,7 @@
 
   void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov-struct.cc	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-struct.cc	Mon Oct 08 11:06:48 2007 +0000
@@ -1057,7 +1057,7 @@
 }
 
 bool
-octave_struct::save_ascii (std::ostream& os, bool& infnan_warned)
+octave_struct::save_ascii (std::ostream& os)
 {
   Octave_map m = map_value ();
   os << "# length: " << m.nfields () << "\n";
@@ -1067,7 +1067,7 @@
     {
       octave_value val = map.contents (i);
 
-      bool b = save_ascii_data (os, val, m.key (i), infnan_warned, false, 0);
+      bool b = save_ascii_data (os, val, m.key (i), false, 0);
       
       if (! b)
 	return os;
--- a/src/ov-struct.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov-struct.h	Mon Oct 08 11:06:48 2007 +0000
@@ -117,7 +117,7 @@
 
   bool print_name_tag (std::ostream& os, const std::string& name) const;
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned);
+  bool save_ascii (std::ostream& os);
 
   bool load_ascii (std::istream& is);
 
--- a/src/ov.h	Mon Oct 08 10:22:17 2007 +0000
+++ b/src/ov.h	Mon Oct 08 11:06:48 2007 +0000
@@ -803,11 +803,9 @@
   void print_info (std::ostream& os,
 			   const std::string& prefix = std::string ()) const;
 
-  bool save_ascii (std::ostream& os, bool& infnan_warned)
-    { return rep->save_ascii (os, infnan_warned); }
+  bool save_ascii (std::ostream& os) { return rep->save_ascii (os); }
 
-  bool load_ascii (std::istream& is)
-    { return rep->load_ascii (is); }
+  bool load_ascii (std::istream& is) { return rep->load_ascii (is); }
 
   bool save_binary (std::ostream& os, bool& save_as_floats)
     { return rep->save_binary (os, save_as_floats); }