Mercurial > octave-nkf

changeset 4574:6cb22b9e3942

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2003-10-31 05:57:43 by jwe]
author jwe
date Fri, 31 Oct 2003 05:57:44 +0000
parents c8c06e5ef5db
children c7ba572047df
files liboctave/ChangeLog liboctave/dMatrix.cc liboctave/data-conv.cc liboctave/lo-ieee.cc liboctave/mach-info.cc liboctave/mach-info.h src/load-save.cc src/oct-fstrm.h src/oct-iostrm.h src/oct-prcstrm.h src/oct-stdstrm.h src/oct-stream.cc src/oct-stream.h src/oct-strstrm.h src/pr-output.cc src/sysdep.cc
diffstat 16 files changed, 140 insertions(+), 135 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Fri Oct 31 03:28:08 2003 +0000
+++ b/liboctave/ChangeLog	Fri Oct 31 05:57:44 2003 +0000
@@ -1,3 +1,8 @@
+2003-10-30  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* mach-info.h (oct_mach_info): Prefix enum elements with flt_fmt_.
+	Change all uses.
+
 2003-10-29  Petter Risholm  <risholm@stud.ntnu.no>
 
 	* dNDArray.cc (NDArray::cumprod, NDArray::cumsum, NDArray::prod,
--- a/liboctave/dMatrix.cc	Fri Oct 31 03:28:08 2003 +0000
+++ b/liboctave/dMatrix.cc	Fri Oct 31 05:57:44 2003 +0000
@@ -2736,11 +2736,11 @@
   bool swap_bytes = false;
 
   if (oct_mach_info::words_big_endian ())
-    swap_bytes = (flt_fmt == oct_mach_info::ieee_little_endian
-		 || flt_fmt == oct_mach_info::vax_g
-		 || flt_fmt == oct_mach_info::vax_g);
+    swap_bytes = (flt_fmt == oct_mach_info::flt_fmt_ieee_little_endian
+		 || flt_fmt == oct_mach_info::flt_fmt_vax_g
+		 || flt_fmt == oct_mach_info::flt_fmt_vax_g);
   else
-    swap_bytes = (flt_fmt == oct_mach_info::ieee_big_endian);
+    swap_bytes = (flt_fmt == oct_mach_info::flt_fmt_ieee_big_endian);
 
   for (;;)
     {
@@ -2970,11 +2970,11 @@
   bool swap_bytes = false;
 
   if (oct_mach_info::words_big_endian ())
-    swap_bytes = (flt_fmt == oct_mach_info::ieee_little_endian
-		 || flt_fmt == oct_mach_info::vax_g
-		 || flt_fmt == oct_mach_info::vax_g);
+    swap_bytes = (flt_fmt == oct_mach_info::flt_fmt_ieee_little_endian
+		 || flt_fmt == oct_mach_info::flt_fmt_vax_g
+		 || flt_fmt == oct_mach_info::flt_fmt_vax_g);
   else
-    swap_bytes = (flt_fmt == oct_mach_info::ieee_big_endian);
+    swap_bytes = (flt_fmt == oct_mach_info::flt_fmt_ieee_big_endian);
 
   for (int i = 0; i < n; i++)
     {
--- a/liboctave/data-conv.cc	Fri Oct 31 03:28:08 2003 +0000
+++ b/liboctave/data-conv.cc	Fri Oct 31 05:57:44 2003 +0000
@@ -444,25 +444,25 @@
 {
   switch (oct_mach_info::native_float_format ())
     {
-    case oct_mach_info::ieee_little_endian:
+    case oct_mach_info::flt_fmt_ieee_little_endian:
       switch (fmt)
 	{
-	case oct_mach_info::ieee_little_endian:
+	case oct_mach_info::flt_fmt_ieee_little_endian:
 	  break;
 
-	case oct_mach_info::ieee_big_endian:
+	case oct_mach_info::flt_fmt_ieee_big_endian:
 	  IEEE_big_double_to_IEEE_little_double (data, len);
 	  break;
 
-	case oct_mach_info::vax_d:
+	case oct_mach_info::flt_fmt_vax_d:
 	  VAX_D_double_to_IEEE_little_double (data, len);
 	  break;
 
-	case oct_mach_info::vax_g:
+	case oct_mach_info::flt_fmt_vax_g:
 	  VAX_G_double_to_IEEE_little_double (data, len);
 	  break;
 
-	case oct_mach_info::cray:
+	case oct_mach_info::flt_fmt_cray:
 	  Cray_to_IEEE_little_double (data, len);
 	  break;
 
@@ -472,25 +472,25 @@
 	}
       break;
 
-    case oct_mach_info::ieee_big_endian:
+    case oct_mach_info::flt_fmt_ieee_big_endian:
       switch (fmt)
 	{
-	case oct_mach_info::ieee_little_endian:
+	case oct_mach_info::flt_fmt_ieee_little_endian:
 	  IEEE_little_double_to_IEEE_big_double (data, len);
 	  break;
 
-	case oct_mach_info::ieee_big_endian:
+	case oct_mach_info::flt_fmt_ieee_big_endian:
 	  break;
 
-	case oct_mach_info::vax_d:
+	case oct_mach_info::flt_fmt_vax_d:
 	  VAX_D_double_to_IEEE_big_double (data, len);
 	  break;
 
-	case oct_mach_info::vax_g:
+	case oct_mach_info::flt_fmt_vax_g:
 	  VAX_G_double_to_IEEE_big_double (data, len);
 	  break;
 
-	case oct_mach_info::cray:
+	case oct_mach_info::flt_fmt_cray:
 	  Cray_to_IEEE_big_double (data, len);
 	  break;
 
@@ -500,25 +500,25 @@
 	}
       break;
 
-    case oct_mach_info::vax_d:
+    case oct_mach_info::flt_fmt_vax_d:
       switch (fmt)
 	{
-	case oct_mach_info::ieee_little_endian:
+	case oct_mach_info::flt_fmt_ieee_little_endian:
 	  IEEE_little_double_to_VAX_D_double (data, len);
 	  break;
 
-	case oct_mach_info::ieee_big_endian:
+	case oct_mach_info::flt_fmt_ieee_big_endian:
 	  IEEE_big_double_to_VAX_D_double (data, len);
 	  break;
 
-	case oct_mach_info::vax_d:
+	case oct_mach_info::flt_fmt_vax_d:
 	  break;
 
-	case oct_mach_info::vax_g:
+	case oct_mach_info::flt_fmt_vax_g:
 	  VAX_G_double_to_VAX_D_double (data, len);
 	  break;
 
-	case oct_mach_info::cray:
+	case oct_mach_info::flt_fmt_cray:
 	  Cray_to_VAX_D_double (data, len);
 	  break;
 
@@ -528,25 +528,25 @@
 	}
       break;
 
-    case oct_mach_info::vax_g:
+    case oct_mach_info::flt_fmt_vax_g:
       switch (fmt)
 	{
-	case oct_mach_info::ieee_little_endian:
+	case oct_mach_info::flt_fmt_ieee_little_endian:
 	  IEEE_little_double_to_VAX_G_double (data, len);
 	  break;
 
-	case oct_mach_info::ieee_big_endian:
+	case oct_mach_info::flt_fmt_ieee_big_endian:
 	  IEEE_big_double_to_VAX_G_double (data, len);
 	  break;
 
-	case oct_mach_info::vax_d:
+	case oct_mach_info::flt_fmt_vax_d:
 	  VAX_D_double_to_VAX_G_double (data, len);
 	  break;
 
-	case oct_mach_info::vax_g:
+	case oct_mach_info::flt_fmt_vax_g:
 	  break;
 
-	case oct_mach_info::cray:
+	case oct_mach_info::flt_fmt_cray:
 	  Cray_to_VAX_G_double (data, len);
 	  break;
 
@@ -570,25 +570,25 @@
 {
   switch (oct_mach_info::native_float_format ())
     {
-    case oct_mach_info::ieee_little_endian:
+    case oct_mach_info::flt_fmt_ieee_little_endian:
       switch (fmt)
 	{
-	case oct_mach_info::ieee_little_endian:
+	case oct_mach_info::flt_fmt_ieee_little_endian:
 	  break;
 
-	case oct_mach_info::ieee_big_endian:
+	case oct_mach_info::flt_fmt_ieee_big_endian:
 	  IEEE_big_float_to_IEEE_little_float (data, len);
 	  break;
 
-	case oct_mach_info::vax_d:
+	case oct_mach_info::flt_fmt_vax_d:
 	  VAX_D_float_to_IEEE_little_float (data, len);
 	  break;
 
-	case oct_mach_info::vax_g:
+	case oct_mach_info::flt_fmt_vax_g:
 	  VAX_G_float_to_IEEE_little_float (data, len);
 	  break;
 
-	case oct_mach_info::cray:
+	case oct_mach_info::flt_fmt_cray:
 	  Cray_to_IEEE_little_float (data, len);
 	  break;
 
@@ -598,25 +598,25 @@
 	}
       break;
 
-    case oct_mach_info::ieee_big_endian:
+    case oct_mach_info::flt_fmt_ieee_big_endian:
       switch (fmt)
 	{
-	case oct_mach_info::ieee_little_endian:
+	case oct_mach_info::flt_fmt_ieee_little_endian:
 	  IEEE_little_float_to_IEEE_big_float (data, len);
 	  break;
 
-	case oct_mach_info::ieee_big_endian:
+	case oct_mach_info::flt_fmt_ieee_big_endian:
 	  break;
 
-	case oct_mach_info::vax_d:
+	case oct_mach_info::flt_fmt_vax_d:
 	  VAX_D_float_to_IEEE_big_float (data, len);
 	  break;
 
-	case oct_mach_info::vax_g:
+	case oct_mach_info::flt_fmt_vax_g:
 	  VAX_G_float_to_IEEE_big_float (data, len);
 	  break;
 
-	case oct_mach_info::cray:
+	case oct_mach_info::flt_fmt_cray:
 	  Cray_to_IEEE_big_float (data, len);
 	  break;
 
@@ -626,25 +626,25 @@
 	}
       break;
 
-    case oct_mach_info::vax_d:
+    case oct_mach_info::flt_fmt_vax_d:
       switch (fmt)
 	{
-	case oct_mach_info::ieee_little_endian:
+	case oct_mach_info::flt_fmt_ieee_little_endian:
 	  IEEE_little_float_to_VAX_D_float (data, len);
 	  break;
 
-	case oct_mach_info::ieee_big_endian:
+	case oct_mach_info::flt_fmt_ieee_big_endian:
 	  IEEE_big_float_to_VAX_D_float (data, len);
 	  break;
 
-	case oct_mach_info::vax_d:
+	case oct_mach_info::flt_fmt_vax_d:
 	  break;
 
-	case oct_mach_info::vax_g:
+	case oct_mach_info::flt_fmt_vax_g:
 	  VAX_G_float_to_VAX_D_float (data, len);
 	  break;
 
-	case oct_mach_info::cray:
+	case oct_mach_info::flt_fmt_cray:
 	  Cray_to_VAX_D_float (data, len);
 	  break;
 
@@ -654,25 +654,25 @@
 	}
       break;
 
-    case oct_mach_info::vax_g:
+    case oct_mach_info::flt_fmt_vax_g:
       switch (fmt)
 	{
-	case oct_mach_info::ieee_little_endian:
+	case oct_mach_info::flt_fmt_ieee_little_endian:
 	  IEEE_little_float_to_VAX_G_float (data, len);
 	  break;
 
-	case oct_mach_info::ieee_big_endian:
+	case oct_mach_info::flt_fmt_ieee_big_endian:
 	  IEEE_big_float_to_VAX_G_float (data, len);
 	  break;
 
-	case oct_mach_info::vax_d:
+	case oct_mach_info::flt_fmt_vax_d:
 	  VAX_D_float_to_VAX_G_float (data, len);
 	  break;
 
-	case oct_mach_info::vax_g:
+	case oct_mach_info::flt_fmt_vax_g:
 	  break;
 
-	case oct_mach_info::cray:
+	case oct_mach_info::flt_fmt_cray:
 	  Cray_to_VAX_G_float (data, len);
 	  break;
 
--- a/liboctave/lo-ieee.cc	Fri Oct 31 03:28:08 2003 +0000
+++ b/liboctave/lo-ieee.cc	Fri Oct 31 05:57:44 2003 +0000
@@ -86,7 +86,7 @@
 
   oct_mach_info::float_format ff = oct_mach_info::native_float_format ();
 
-  if (ff == oct_mach_info::ieee_big_endian)
+  if (ff == oct_mach_info::flt_fmt_ieee_big_endian)
     {
       lo_ieee_hw = 0;
       lo_ieee_lw = 1;
--- a/liboctave/mach-info.cc	Fri Oct 31 03:28:08 2003 +0000
+++ b/liboctave/mach-info.cc	Fri Oct 31 05:57:44 2003 +0000
@@ -74,31 +74,31 @@
 {
   float_params fp[5];
 
-  INIT_FLT_PAR (fp[0], oct_mach_info::ieee_big_endian,
+  INIT_FLT_PAR (fp[0], oct_mach_info::flt_fmt_ieee_big_endian,
 		   1048576,  0,
 		2146435071, -1,
 		1017118720,  0,
 		1018167296,  0);
 
-  INIT_FLT_PAR (fp[1], oct_mach_info::ieee_little_endian,
+  INIT_FLT_PAR (fp[1], oct_mach_info::flt_fmt_ieee_little_endian,
 		 0,    1048576,
 		-1, 2146435071,
 		 0, 1017118720,
 		 0, 1018167296);
 
-  INIT_FLT_PAR (fp[2], oct_mach_info::vax_d,
+  INIT_FLT_PAR (fp[2], oct_mach_info::flt_fmt_vax_d,
 		   128,  0,
 		-32769, -1,
 		  9344,  0,
 		  9344,  0);
 
-  INIT_FLT_PAR (fp[3], oct_mach_info::vax_g,
+  INIT_FLT_PAR (fp[3], oct_mach_info::flt_fmt_vax_g,
 		    16,  0,
 		-32769, -1,
 		 15552,  0,
 		 15552,  0);
 
-  INIT_FLT_PAR (fp[4], oct_mach_info::unknown,
+  INIT_FLT_PAR (fp[4], oct_mach_info::flt_fmt_unknown,
 		0, 0,
 		0, 0,
 		0, 0,
@@ -120,7 +120,7 @@
 	  break;
 	}
     }
-  while (fp[++i].fp_fmt != oct_mach_info::unknown);
+  while (fp[++i].fp_fmt != oct_mach_info::flt_fmt_unknown);
 }
 
 void
@@ -168,7 +168,7 @@
 oct_mach_info::native_float_format (void)
 {
   return (instance_ok ())
-    ? instance->native_float_fmt : oct_mach_info::unknown;
+    ? instance->native_float_fmt : oct_mach_info::flt_fmt_unknown;
 }
 
 bool
@@ -188,22 +188,22 @@
 oct_mach_info::float_format
 oct_mach_info::string_to_float_format (const std::string& s)
 {
-  oct_mach_info::float_format retval = oct_mach_info::unknown;
+  oct_mach_info::float_format retval = oct_mach_info::flt_fmt_unknown;
 
   if (s == "native" || s == "n")
-    retval = oct_mach_info::native;
+    retval = oct_mach_info::flt_fmt_native;
   else if (s == "ieee-be" || s == "b")
-    retval = oct_mach_info::ieee_big_endian;
+    retval = oct_mach_info::flt_fmt_ieee_big_endian;
   else if (s == "ieee-le" || s == "l")
-    retval = oct_mach_info::ieee_little_endian;
+    retval = oct_mach_info::flt_fmt_ieee_little_endian;
   else if (s == "vaxd" || s == "d")
-    retval = oct_mach_info::vax_d;
+    retval = oct_mach_info::flt_fmt_vax_d;
   else if (s == "vaxg" || s == "g")
-    retval = oct_mach_info::vax_g;
+    retval = oct_mach_info::flt_fmt_vax_g;
   else if (s == "cray" || s == "c")
-    retval = oct_mach_info::cray;
+    retval = oct_mach_info::flt_fmt_cray;
   else if (s == "unknown")
-    retval = oct_mach_info::unknown;
+    retval = oct_mach_info::flt_fmt_unknown;
   else
     (*current_liboctave_error_handler)
       ("invalid architecture type specified");
@@ -218,27 +218,27 @@
 
   switch (flt_fmt)
     {
-    case native:
+    case flt_fmt_native:
       retval = "native";
       break;
 
-    case ieee_big_endian:
+    case flt_fmt_ieee_big_endian:
       retval = "ieee_big_endian";
       break;
 
-    case ieee_little_endian:
+    case flt_fmt_ieee_little_endian:
       retval = "ieee_little_endian";
       break;
 
-    case vax_d:
+    case flt_fmt_vax_d:
       retval = "vax_d_float";
       break;
 
-    case vax_g:
+    case flt_fmt_vax_g:
       retval = "vax_g_float";
       break;
 
-    case cray:
+    case flt_fmt_cray:
       retval = "cray";
       break;
 
--- a/liboctave/mach-info.h	Fri Oct 31 03:28:08 2003 +0000
+++ b/liboctave/mach-info.h	Fri Oct 31 05:57:44 2003 +0000
@@ -36,13 +36,13 @@
 
   enum float_format
     {
-      native,
-      unknown,
-      ieee_little_endian,
-      ieee_big_endian,
-      vax_d,
-      vax_g,
-      cray
+      flt_fmt_native,
+      flt_fmt_unknown,
+      flt_fmt_ieee_little_endian,
+      flt_fmt_ieee_big_endian,
+      flt_fmt_vax_d,
+      flt_fmt_vax_g,
+      flt_fmt_cray
     };
 
   static bool instance_ok (void);
--- a/src/load-save.cc	Fri Oct 31 03:28:08 2003 +0000
+++ b/src/load-save.cc	Fri Oct 31 05:57:44 2003 +0000
@@ -2287,32 +2287,32 @@
 static oct_mach_info::float_format
 mopt_digit_to_float_format (int mach)
 {
-  oct_mach_info::float_format flt_fmt = oct_mach_info::unknown;
+  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_unknown;
 
   switch (mach)
     {
     case 0:
-      flt_fmt = oct_mach_info::ieee_little_endian;
+      flt_fmt = oct_mach_info::flt_fmt_ieee_little_endian;
       break;
 
     case 1:
-      flt_fmt = oct_mach_info::ieee_big_endian;
+      flt_fmt = oct_mach_info::flt_fmt_ieee_big_endian;
       break;
 
     case 2:
-      flt_fmt = oct_mach_info::vax_d;
+      flt_fmt = oct_mach_info::flt_fmt_vax_d;
       break;
 
     case 3:
-      flt_fmt = oct_mach_info::vax_g;
+      flt_fmt = oct_mach_info::flt_fmt_vax_g;
       break;
 
     case 4:
-      flt_fmt = oct_mach_info::cray;
+      flt_fmt = oct_mach_info::flt_fmt_cray;
       break;
 
     default:
-      flt_fmt = oct_mach_info::unknown;
+      flt_fmt = oct_mach_info::flt_fmt_unknown;
       break;
     }
 
@@ -2326,23 +2326,23 @@
 
   switch (flt_fmt)
     {
-    case oct_mach_info::ieee_little_endian:
+    case oct_mach_info::flt_fmt_ieee_little_endian:
       retval = 0;
       break;
 
-    case oct_mach_info::ieee_big_endian:
+    case oct_mach_info::flt_fmt_ieee_big_endian:
       retval = 1;
       break;
 
-    case oct_mach_info::vax_d:
+    case oct_mach_info::flt_fmt_vax_d:
       retval = 2;
       break;
 
-    case oct_mach_info::vax_g:
+    case oct_mach_info::flt_fmt_vax_g:
       retval = 3;
       break;
 
-    case oct_mach_info::cray:
+    case oct_mach_info::flt_fmt_cray:
       retval = 4;
       break;
 
@@ -2374,7 +2374,7 @@
   // initialization of variable.
 
   Matrix re;
-  oct_mach_info::float_format flt_fmt = oct_mach_info::unknown;
+  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_unknown;
   bool swap = false;
   int type = 0;
   int prec = 0;
@@ -2403,7 +2403,7 @@
 
   flt_fmt = mopt_digit_to_float_format (mach);
 
-  if (flt_fmt == oct_mach_info::unknown)
+  if (flt_fmt == oct_mach_info::flt_fmt_unknown)
     {
       error ("load: unrecognized binary format!");
       return retval;
@@ -2615,7 +2615,7 @@
   // initialization of variable.
 
   Matrix re;
-  oct_mach_info::float_format flt_fmt = oct_mach_info::unknown;
+  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_unknown;
   int type = 0;
   bool imag;
   bool logicalvar;
@@ -2635,9 +2635,9 @@
 
   // MAT files always use IEEE floating point
   if ((number == 1) ^ swap)
-    flt_fmt = oct_mach_info::ieee_big_endian;
+    flt_fmt = oct_mach_info::flt_fmt_ieee_big_endian;
   else
-    flt_fmt = oct_mach_info::ieee_little_endian;
+    flt_fmt = oct_mach_info::flt_fmt_ieee_little_endian;
 
   // element type and length
   if (read_mat5_tag (is, swap, type, element_length))
@@ -3002,7 +3002,7 @@
 
   flt_fmt = mopt_digit_to_float_format (tmp);
 
-  if (flt_fmt == oct_mach_info::unknown)
+  if (flt_fmt == oct_mach_info::flt_fmt_unknown)
     {
       if (! quiet)
         error ("load: unrecognized binary format!");
@@ -3032,7 +3032,7 @@
       return retval;
     }
 
-  oct_mach_info::float_format flt_fmt = oct_mach_info::unknown;
+  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_unknown;
 
   bool swap = false;
 
@@ -3401,7 +3401,7 @@
 
   std::string orig_fname = argv[i];
 
-  oct_mach_info::float_format flt_fmt = oct_mach_info::unknown;
+  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_unknown;
 
   bool swap = false;
 
--- a/src/oct-fstrm.h	Fri Oct 31 03:28:08 2003 +0000
+++ b/src/oct-fstrm.h	Fri Oct 31 05:57:44 2003 +0000
@@ -36,12 +36,12 @@
   octave_fstream (const std::string& nm_arg,
 		  std::ios::openmode arg_md = std::ios::in|std::ios::out,
 		  oct_mach_info::float_format flt_fmt =
-		  oct_mach_info::native);
+		  oct_mach_info::flt_fmt_native);
 
   static octave_stream
   create (const std::string& nm_arg,
 	  std::ios::openmode arg_md = std::ios::in|std::ios::out,
-	  oct_mach_info::float_format flt_fmt = oct_mach_info::native);
+	  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_native);
 
   // Position a stream at OFFSET relative to ORIGIN.
 
--- a/src/oct-iostrm.h	Fri Oct 31 03:28:08 2003 +0000
+++ b/src/oct-iostrm.h	Fri Oct 31 05:57:44 2003 +0000
@@ -35,7 +35,7 @@
   octave_base_iostream (const std::string& n = std::string (),
 			std::ios::openmode md = std::ios::in|std::ios::out,
 			oct_mach_info::float_format flt_fmt =
-			oct_mach_info::native)
+			oct_mach_info::flt_fmt_native)
     : octave_base_stream (md, flt_fmt), nm (n) { }
 
   // Position a stream at OFFSET relative to ORIGIN.
@@ -79,7 +79,7 @@
 public:
 
   octave_istream (std::istream *arg = 0, const std::string& nm = std::string ())
-    : octave_base_iostream (nm, std::ios::in, oct_mach_info::native),
+    : octave_base_iostream (nm, std::ios::in, oct_mach_info::flt_fmt_native),
       is (arg) { }
 
   static octave_stream
@@ -116,7 +116,7 @@
 public:
 
   octave_ostream (std::ostream *arg, const std::string& nm = std::string ())
-    : octave_base_iostream (nm, std::ios::out, oct_mach_info::native),
+    : octave_base_iostream (nm, std::ios::out, oct_mach_info::flt_fmt_native),
       os (arg) { }
 
   static octave_stream
--- a/src/oct-prcstrm.h	Fri Oct 31 03:28:08 2003 +0000
+++ b/src/oct-prcstrm.h	Fri Oct 31 05:57:44 2003 +0000
@@ -36,11 +36,11 @@
   octave_iprocstream (const std::string& n,
 		      std::ios::openmode arg_md = std::ios::in,
 		      oct_mach_info::float_format flt_fmt =
-		      oct_mach_info::native);
+		      oct_mach_info::flt_fmt_native);
 
   static octave_stream
   create (const std::string& n, std::ios::openmode arg_md = std::ios::in,
-	  oct_mach_info::float_format flt_fmt = oct_mach_info::native);
+	  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_native);
 
 protected:
 
@@ -63,11 +63,11 @@
   octave_oprocstream (const std::string& n,
 		      std::ios::openmode arg_md = std::ios::out,
 		      oct_mach_info::float_format flt_fmt =
-		      oct_mach_info::native);
+		      oct_mach_info::flt_fmt_native);
 
   static octave_stream
   create (const std::string& n, std::ios::openmode arg_md = std::ios::out,
-	  oct_mach_info::float_format flt_fmt = oct_mach_info::native);
+	  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_native);
 
 protected:
 
--- a/src/oct-stdstrm.h	Fri Oct 31 03:28:08 2003 +0000
+++ b/src/oct-stdstrm.h	Fri Oct 31 05:57:44 2003 +0000
@@ -33,7 +33,7 @@
 
   octave_stdiostream (const std::string& n, FILE *f = 0,
 		      std::ios::openmode arg_md = std::ios::in|std::ios::out,
-		      oct_mach_info::float_format flt_fmt = oct_mach_info::native,
+		      oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_native,
 		      c_file_ptr_buf::close_fcn cf = c_file_ptr_buf::fclose)
     : octave_base_stream (arg_md, flt_fmt), nm (n), md (arg_md), s(0)
   {
@@ -44,7 +44,7 @@
   static octave_stream
   create (const std::string& n, FILE *f = 0,
 	  std::ios::openmode arg_md = std::ios::in|std::ios::out,
-	  oct_mach_info::float_format flt_fmt = oct_mach_info::native,
+	  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_native,
 	  c_file_ptr_buf::close_fcn cf = c_file_ptr_buf::fclose)
   {
     return octave_stream (new octave_stdiostream (n, f, arg_md, flt_fmt, cf));
--- a/src/oct-stream.cc	Fri Oct 31 03:28:08 2003 +0000
+++ b/src/oct-stream.cc	Fri Oct 31 05:57:44 2003 +0000
@@ -1044,7 +1044,7 @@
 
       if (! error_state)
 	{
-	  if (ffmt == oct_mach_info::unknown)
+	  if (ffmt == oct_mach_info::flt_fmt_unknown)
 	    ffmt = float_format ();
 
 	  int tmp = retval.read (is, nr, nc, dt, skip, ffmt);
@@ -2035,7 +2035,7 @@
 
       if (! error_state)
 	{
-	  if (ffmt == oct_mach_info::unknown)
+	  if (ffmt == oct_mach_info::flt_fmt_unknown)
 	    ffmt = float_format ();
 
 	  int tmp = mval.write (os, dt, skip, ffmt);
@@ -2901,7 +2901,7 @@
 oct_mach_info::float_format
 octave_stream::float_format (void) const
 {
-  oct_mach_info::float_format retval = oct_mach_info::unknown;
+  oct_mach_info::float_format retval = oct_mach_info::flt_fmt_unknown;
 
   if (stream_ok ("float_format"))
     retval = rep->float_format ();
--- a/src/oct-stream.h	Fri Oct 31 03:28:08 2003 +0000
+++ b/src/oct-stream.h	Fri Oct 31 05:57:44 2003 +0000
@@ -323,7 +323,7 @@
 public:
 
   octave_base_stream (std::ios::openmode arg_md = std::ios::in|std::ios::out,
-		      oct_mach_info::float_format ff = oct_mach_info::native)
+		      oct_mach_info::float_format ff = oct_mach_info::flt_fmt_native)
     : count (0), md (arg_md), flt_fmt (ff), fail (false), open_state (true)
   { }
 
--- a/src/oct-strstrm.h	Fri Oct 31 03:28:08 2003 +0000
+++ b/src/oct-strstrm.h	Fri Oct 31 05:57:44 2003 +0000
@@ -36,7 +36,7 @@
 
   octave_base_strstream (std::ios::openmode arg_md = std::ios::out,
 			 oct_mach_info::float_format flt_fmt =
-			 oct_mach_info::native)
+			 oct_mach_info::flt_fmt_native)
     : octave_base_stream (arg_md, flt_fmt) { }
 
   // Position a stream at OFFSET relative to ORIGIN.
@@ -78,22 +78,22 @@
   octave_istrstream (const char *data,
 		     std::ios::openmode arg_md = std::ios::out,
 		     oct_mach_info::float_format flt_fmt =
-		     oct_mach_info::native)
+		     oct_mach_info::flt_fmt_native)
     : octave_base_strstream (arg_md, flt_fmt), is (data) { }
 
   octave_istrstream (const std::string& data,
 		     std::ios::openmode arg_md = std::ios::out,
 		     oct_mach_info::float_format flt_fmt =
-		     oct_mach_info::native)
+		     oct_mach_info::flt_fmt_native)
     : octave_base_strstream (arg_md, flt_fmt), is (data.c_str ()) { }
 
   static octave_stream
   create (const char *data, std::ios::openmode arg_md = std::ios::out,
-	  oct_mach_info::float_format flt_fmt = oct_mach_info::native);
+	  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_native);
 
   static octave_stream
   create (const std::string& data, std::ios::openmode arg_md = std::ios::out,
-	  oct_mach_info::float_format flt_fmt = oct_mach_info::native);
+	  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_native);
 
   // Return non-zero if EOF has been reached on this stream.
 
@@ -131,12 +131,12 @@
 
   octave_ostrstream (std::ios::openmode arg_md = std::ios::out,
 		     oct_mach_info::float_format flt_fmt =
-		     oct_mach_info::native)
+		     oct_mach_info::flt_fmt_native)
     : octave_base_strstream (arg_md, flt_fmt) { }
 
   static octave_stream
   create (std::ios::openmode arg_md = std::ios::out,
-	  oct_mach_info::float_format flt_fmt = oct_mach_info::native);
+	  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_native);
 
   // Return non-zero if EOF has been reached on this stream.
 
--- a/src/pr-output.cc	Fri Oct 31 03:28:08 2003 +0000
+++ b/src/pr-output.cc	Fri Oct 31 05:57:44 2003 +0000
@@ -1125,9 +1125,9 @@
 	    = os.flags (std::ios::right | std::ios::hex);
 
 	  if (hex_format > 1
-	      || flt_fmt == oct_mach_info::ieee_big_endian
-	      || flt_fmt == oct_mach_info::cray
-	      || flt_fmt == oct_mach_info::unknown)
+	      || flt_fmt == oct_mach_info::flt_fmt_ieee_big_endian
+	      || flt_fmt == oct_mach_info::flt_fmt_cray
+	      || flt_fmt == oct_mach_info::flt_fmt_unknown)
 	    {
 	      for (size_t i = 0; i < sizeof (double); i++)
 		os << std::setw (2) << static_cast<int> (tmp.i[i]);
@@ -1155,9 +1155,9 @@
 	  oct_mach_info::float_format flt_fmt =
 	    oct_mach_info::native_float_format ();
 
-	  if (flt_fmt == oct_mach_info::ieee_big_endian
-	      || flt_fmt == oct_mach_info::cray
-	      || flt_fmt == oct_mach_info::unknown)
+	  if (flt_fmt == oct_mach_info::flt_fmt_ieee_big_endian
+	      || flt_fmt == oct_mach_info::flt_fmt_cray
+	      || flt_fmt == oct_mach_info::flt_fmt_unknown)
 	    {
 	      for (size_t i = 0; i < sizeof (double); i++)
 		PRINT_CHAR_BITS (os, tmp.i[i]);
--- a/src/sysdep.cc	Fri Oct 31 03:28:08 2003 +0000
+++ b/src/sysdep.cc	Fri Oct 31 05:57:44 2003 +0000
@@ -633,8 +633,8 @@
   oct_mach_info::float_format flt_fmt =
     oct_mach_info::native_float_format ();
 
-  return octave_value (flt_fmt == oct_mach_info::ieee_little_endian
-		       || flt_fmt == oct_mach_info::ieee_big_endian);
+  return octave_value (flt_fmt == oct_mach_info::flt_fmt_ieee_little_endian
+		       || flt_fmt == oct_mach_info::flt_fmt_ieee_big_endian);
 }
 
 DEFUN (tilde_expand, args, ,