# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1463637575 14400
# Node ID c4ab2e54f1008efa03ef63ecf6213d65d62f8d69
# Parent  a99c2407f930f669d67a5f44cd863fb180f2eb68
use namespace for oct_mach_info class

* mach-info.h, mach-info.cc: Put oct_mach_info in octave namespace and
rename to mach_info.  Change all uses.

diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/file-io.cc
--- a/libinterp/corefcn/file-io.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/file-io.cc	Thu May 19 01:59:35 2016 -0400
@@ -447,8 +447,8 @@
 
   std::ios::openmode md = fopen_mode_to_ios_mode (mode);
 
-  oct_mach_info::float_format flt_fmt =
-    oct_mach_info::string_to_float_format (arch);
+  octave::mach_info::float_format flt_fmt =
+    octave::mach_info::string_to_float_format (arch);
 
   std::string fname = octave::sys::file_ops::tilde_expand (name);
 
@@ -2279,8 +2279,8 @@
 
   std::string arch = arch_arg.xstring_value ("fread: ARCH architecture type must be a string");
 
-  oct_mach_info::float_format flt_fmt
-    = oct_mach_info::string_to_float_format (arch);
+  octave::mach_info::float_format flt_fmt
+    = octave::mach_info::string_to_float_format (arch);
 
   return os.read (size, block_size, input_type, output_type, skip,
                   flt_fmt, count);
@@ -2527,8 +2527,8 @@
 
   std::string arch = arch_arg.xstring_value ("fwrite: ARCH architecture type must be a string");
 
-  oct_mach_info::float_format flt_fmt
-    = oct_mach_info::string_to_float_format (arch);
+  octave::mach_info::float_format flt_fmt
+    = octave::mach_info::string_to_float_format (arch);
 
   return os.write (data, block_size, output_type, skip, flt_fmt);
 }
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/load-save.cc
--- a/libinterp/corefcn/load-save.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/load-save.cc	Thu May 19 01:59:35 2016 -0400
@@ -175,7 +175,7 @@
 
 int
 read_binary_file_header (std::istream& is, bool& swap,
-                         oct_mach_info::float_format& flt_fmt, bool quiet)
+                         octave::mach_info::float_format& flt_fmt, bool quiet)
 {
   const int magic_len = 10;
   char magic[magic_len+1];
@@ -183,9 +183,9 @@
   magic[magic_len] = '\0';
 
   if (strncmp (magic, "Octave-1-L", magic_len) == 0)
-    swap = oct_mach_info::words_big_endian ();
+    swap = octave::mach_info::words_big_endian ();
   else if (strncmp (magic, "Octave-1-B", magic_len) == 0)
-    swap = ! oct_mach_info::words_big_endian ();
+    swap = ! octave::mach_info::words_big_endian ();
   else
     {
       if (! quiet)
@@ -199,7 +199,7 @@
 
   flt_fmt = mopt_digit_to_float_format (tmp);
 
-  if (flt_fmt == oct_mach_info::flt_fmt_unknown)
+  if (flt_fmt == octave::mach_info::flt_fmt_unknown)
     {
       if (! quiet)
         error ("load: unrecognized binary format!");
@@ -232,7 +232,7 @@
 {
   load_save_format retval = LS_UNKNOWN;
 
-  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_unknown;
+  octave::mach_info::float_format flt_fmt = octave::mach_info::flt_fmt_unknown;
 
   bool swap = false;
 
@@ -342,7 +342,7 @@
 
 octave_value
 do_load (std::istream& stream, const std::string& orig_fname,
-         load_save_format format, oct_mach_info::float_format flt_fmt,
+         load_save_format format, octave::mach_info::float_format flt_fmt,
          bool list_only, bool swap, bool verbose,
          const string_vector& argv, int argv_idx, int argc, int nargout)
 {
@@ -720,7 +720,7 @@
   else
     i--;
 
-  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_unknown;
+  octave::mach_info::float_format flt_fmt = octave::mach_info::flt_fmt_unknown;
 
   bool swap = false;
 
@@ -1160,11 +1160,11 @@
     {
     case LS_BINARY:
       {
-        os << (oct_mach_info::words_big_endian ()
+        os << (octave::mach_info::words_big_endian ()
                ? "Octave-1-B" : "Octave-1-L");
 
-        oct_mach_info::float_format flt_fmt =
-          oct_mach_info::native_float_format ();
+        octave::mach_info::float_format flt_fmt =
+          octave::mach_info::native_float_format ();
 
         char tmp = static_cast<char> (float_format_to_mopt_digit (flt_fmt));
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/load-save.h
--- a/libinterp/corefcn/load-save.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/load-save.h	Thu May 19 01:59:35 2016 -0400
@@ -74,12 +74,12 @@
 
 extern int
 read_binary_file_header (std::istream& is, bool& swap,
-                         oct_mach_info::float_format& flt_fmt,
+                         octave::mach_info::float_format& flt_fmt,
                          bool quiet = false);
 
 extern octave_value
 do_load (std::istream& stream, const std::string& orig_fname,
-         load_save_format format, oct_mach_info::float_format flt_fmt,
+         load_save_format format, octave::mach_info::float_format flt_fmt,
          bool list_only, bool swap, bool verbose,
          const string_vector& argv, int argv_idx, int argc, int nargout);
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/ls-mat4.cc
--- a/libinterp/corefcn/ls-mat4.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/ls-mat4.cc	Thu May 19 01:59:35 2016 -0400
@@ -75,7 +75,7 @@
 static void
 read_mat_binary_data (std::istream& is, double *data, int precision,
                       int len, bool swap,
-                      oct_mach_info::float_format flt_fmt)
+                      octave::mach_info::float_format flt_fmt)
 {
   switch (precision)
     {
@@ -145,7 +145,7 @@
 //
 // Gag me.
 
-  if (oct_mach_info::words_big_endian () && mopt == 0)
+  if (octave::mach_info::words_big_endian () && mopt == 0)
     swap = true;
 
   // mopt is signed, therefore byte swap may result in negative value.
@@ -176,26 +176,26 @@
 // We don't just use a cast here, because we need to be able to detect
 // possible errors.
 
-oct_mach_info::float_format
+octave::mach_info::float_format
 mopt_digit_to_float_format (int mach)
 {
-  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_unknown;
+  octave::mach_info::float_format flt_fmt = octave::mach_info::flt_fmt_unknown;
 
   switch (mach)
     {
     case 0:
-      flt_fmt = oct_mach_info::flt_fmt_ieee_little_endian;
+      flt_fmt = octave::mach_info::flt_fmt_ieee_little_endian;
       break;
 
     case 1:
-      flt_fmt = oct_mach_info::flt_fmt_ieee_big_endian;
+      flt_fmt = octave::mach_info::flt_fmt_ieee_big_endian;
       break;
 
     case 2:
     case 3:
     case 4:
     default:
-      flt_fmt = oct_mach_info::flt_fmt_unknown;
+      flt_fmt = octave::mach_info::flt_fmt_unknown;
       break;
     }
 
@@ -203,17 +203,17 @@
 }
 
 int
-float_format_to_mopt_digit (oct_mach_info::float_format flt_fmt)
+float_format_to_mopt_digit (octave::mach_info::float_format flt_fmt)
 {
   int retval = -1;
 
   switch (flt_fmt)
     {
-    case oct_mach_info::flt_fmt_ieee_little_endian:
+    case octave::mach_info::flt_fmt_ieee_little_endian:
       retval = 0;
       break;
 
-    case oct_mach_info::flt_fmt_ieee_big_endian:
+    case octave::mach_info::flt_fmt_ieee_big_endian:
       retval = 1;
       break;
 
@@ -265,10 +265,10 @@
   mopt /= 10;        // Eliminate third digit.
   mach = mopt % 10;  // IEEE, VAX, etc.
 
-  oct_mach_info::float_format flt_fmt;
+  octave::mach_info::float_format flt_fmt;
   flt_fmt = mopt_digit_to_float_format (mach);
 
-  if (flt_fmt == oct_mach_info::flt_fmt_unknown)
+  if (flt_fmt == octave::mach_info::flt_fmt_unknown)
     error ("load: unrecognized binary format!");
 
   if (imag && type == 1)
@@ -404,8 +404,8 @@
 
   mopt += tc.is_sparse_type () ? 2 : tc.is_string () ? 1 : 0;
 
-  oct_mach_info::float_format flt_fmt =
-    oct_mach_info::native_float_format ();;
+  octave::mach_info::float_format flt_fmt =
+    octave::mach_info::native_float_format ();;
 
   mopt += 1000 * float_format_to_mopt_digit (flt_fmt);
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/ls-mat4.h
--- a/libinterp/corefcn/ls-mat4.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/ls-mat4.h	Thu May 19 01:59:35 2016 -0400
@@ -25,11 +25,11 @@
 
 #include "octave-config.h"
 
-extern oct_mach_info::float_format
+extern octave::mach_info::float_format
 mopt_digit_to_float_format (int mach);
 
 extern int
-float_format_to_mopt_digit (oct_mach_info::float_format flt_fmt);
+float_format_to_mopt_digit (octave::mach_info::float_format flt_fmt);
 
 extern int
 read_mat_file_header (std::istream& is, bool& swap, int32_t& mopt,
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/ls-mat5.cc
--- a/libinterp/corefcn/ls-mat5.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/ls-mat5.cc	Thu May 19 01:59:35 2016 -0400
@@ -125,7 +125,7 @@
 static void
 read_mat5_binary_data (std::istream& is, double *data,
                        octave_idx_type  count, bool swap, mat5_data_type type,
-                       oct_mach_info::float_format flt_fmt)
+                       octave::mach_info::float_format flt_fmt)
 {
 
   switch (type)
@@ -190,7 +190,7 @@
 static void
 read_mat5_binary_data (std::istream& is, float *data,
                        octave_idx_type  count, bool swap, mat5_data_type type,
-                       oct_mach_info::float_format flt_fmt)
+                       octave::mach_info::float_format flt_fmt)
 {
 
   switch (type)
@@ -495,11 +495,11 @@
   std::string classname;
 
   // MAT files always use IEEE floating point
-  oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_unknown;
+  octave::mach_info::float_format flt_fmt = octave::mach_info::flt_fmt_unknown;
   if ((number == 1) ^ swap)
-    flt_fmt = oct_mach_info::flt_fmt_ieee_big_endian;
+    flt_fmt = octave::mach_info::flt_fmt_ieee_big_endian;
   else
-    flt_fmt = oct_mach_info::flt_fmt_ieee_little_endian;
+    flt_fmt = octave::mach_info::flt_fmt_ieee_little_endian;
 
   // element type, length and small data element flag
   int32_t type = 0;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/ls-oct-binary.cc
--- a/libinterp/corefcn/ls-oct-binary.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/ls-oct-binary.cc	Thu May 19 01:59:35 2016 -0400
@@ -132,7 +132,7 @@
 
 std::string
 read_binary_data (std::istream& is, bool swap,
-                  oct_mach_info::float_format fmt,
+                  octave::mach_info::float_format fmt,
                   const std::string& filename, bool& global,
                   octave_value& tc, std::string& doc)
 {
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/ls-oct-binary.h
--- a/libinterp/corefcn/ls-oct-binary.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/ls-oct-binary.h	Thu May 19 01:59:35 2016 -0400
@@ -32,7 +32,7 @@
 
 extern OCTINTERP_API std::string
 read_binary_data (std::istream& is, bool swap,
-                  oct_mach_info::float_format fmt,
+                  octave::mach_info::float_format fmt,
                   const std::string& filename, bool& global,
                   octave_value& tc, std::string& doc);
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/oct-fstrm.cc
--- a/libinterp/corefcn/oct-fstrm.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/oct-fstrm.cc	Thu May 19 01:59:35 2016 -0400
@@ -32,14 +32,14 @@
 
 octave_stream
 octave_fstream::create (const std::string& nm_arg, std::ios::openmode arg_md,
-                        oct_mach_info::float_format ff)
+                        octave::mach_info::float_format ff)
 {
   return octave_stream (new octave_fstream (nm_arg, arg_md, ff));
 }
 
 octave_fstream::octave_fstream (const std::string& nm_arg,
                                 std::ios::openmode arg_md,
-                                oct_mach_info::float_format ff)
+                                octave::mach_info::float_format ff)
   : octave_base_stream (arg_md, ff), nm (nm_arg)
 {
   fs.open (nm.c_str (), arg_md);
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/oct-fstrm.h
--- a/libinterp/corefcn/oct-fstrm.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/oct-fstrm.h	Thu May 19 01:59:35 2016 -0400
@@ -37,14 +37,14 @@
 
   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_float_format ());
+                  octave::mach_info::float_format flt_fmt
+                    = octave::mach_info::native_float_format ());
 
   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_float_format ());
+          octave::mach_info::float_format flt_fmt
+            = octave::mach_info::native_float_format ());
 
   // Position a stream at OFFSET relative to ORIGIN.
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/oct-iostrm.h
--- a/libinterp/corefcn/oct-iostrm.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/oct-iostrm.h	Thu May 19 01:59:35 2016 -0400
@@ -36,8 +36,8 @@
 
   octave_base_iostream (const std::string& n = "",
                         std::ios::openmode m = std::ios::in | std::ios::out,
-                        oct_mach_info::float_format ff
-                          = oct_mach_info::native_float_format ())
+                        octave::mach_info::float_format ff
+                          = octave::mach_info::native_float_format ())
     : octave_base_stream (m, ff), nm (n) { }
 
   // Position a stream at OFFSET relative to ORIGIN.
@@ -82,7 +82,7 @@
 
   octave_istream (std::istream *arg = 0, const std::string& n = "")
     : octave_base_iostream (n, std::ios::in,
-                            oct_mach_info::native_float_format ()),
+                            octave::mach_info::native_float_format ()),
       is (arg)
   { }
 
@@ -121,7 +121,7 @@
 
   octave_ostream (std::ostream *arg, const std::string& n = "")
     : octave_base_iostream (n, std::ios::out,
-                            oct_mach_info::native_float_format ()),
+                            octave::mach_info::native_float_format ()),
       os (arg)
   { }
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/oct-prcstrm.cc
--- a/libinterp/corefcn/oct-prcstrm.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/oct-prcstrm.cc	Thu May 19 01:59:35 2016 -0400
@@ -31,14 +31,14 @@
 
 octave_stream
 octave_iprocstream::create (const std::string& n, std::ios::openmode arg_md,
-                            oct_mach_info::float_format ff)
+                            octave::mach_info::float_format ff)
 {
   return octave_stream (new octave_iprocstream (n, arg_md, ff));
 }
 
 octave_iprocstream::octave_iprocstream (const std::string& n,
                                         std::ios::openmode arg_md,
-                                        oct_mach_info::float_format ff)
+                                        octave::mach_info::float_format ff)
   : octave_stdiostream (n, octave_popen (n.c_str (), "r"),
                         arg_md, ff, octave_pclose)
 {
@@ -51,14 +51,14 @@
 
 octave_stream
 octave_oprocstream::create (const std::string& n, std::ios::openmode arg_md,
-                            oct_mach_info::float_format ff)
+                            octave::mach_info::float_format ff)
 {
   return octave_stream (new octave_oprocstream (n, arg_md, ff));
 }
 
 octave_oprocstream::octave_oprocstream (const std::string& n,
                                         std::ios::openmode arg_md,
-                                        oct_mach_info::float_format ff)
+                                        octave::mach_info::float_format ff)
   : octave_stdiostream (n, octave_popen (n.c_str (), "w"),
                         arg_md, ff, octave_pclose)
 {
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/oct-prcstrm.h
--- a/libinterp/corefcn/oct-prcstrm.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/oct-prcstrm.h	Thu May 19 01:59:35 2016 -0400
@@ -37,13 +37,13 @@
 
   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_float_format ());
+                      octave::mach_info::float_format flt_fmt
+                        = octave::mach_info::native_float_format ());
 
   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_float_format ());
+          octave::mach_info::float_format flt_fmt
+            = octave::mach_info::native_float_format ());
 
 protected:
 
@@ -65,13 +65,13 @@
 
   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_float_format ());
+                      octave::mach_info::float_format flt_fmt
+                        = octave::mach_info::native_float_format ());
 
   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_float_format ());
+          octave::mach_info::float_format flt_fmt
+            = octave::mach_info::native_float_format ());
 
 protected:
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/oct-stdstrm.h
--- a/libinterp/corefcn/oct-stdstrm.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/oct-stdstrm.h	Thu May 19 01:59:35 2016 -0400
@@ -36,8 +36,8 @@
 
   octave_tstdiostream (const std::string& n, FILE_T f = 0, int fid = 0,
                        std::ios::openmode m = std::ios::in | std::ios::out,
-                       oct_mach_info::float_format ff
-                         = oct_mach_info::native_float_format (),
+                       octave::mach_info::float_format ff
+                         = octave::mach_info::native_float_format (),
                        typename BUF_T::close_fcn cf = BUF_T::file_close)
     : octave_base_stream (m, ff), nm (n), md (m),
       s (f ? new STREAM_T (f, cf) : 0), fnum (fid)
@@ -106,8 +106,8 @@
 
   octave_stdiostream (const std::string& n, FILE *f = 0,
                       std::ios::openmode m = std::ios::in | std::ios::out,
-                      oct_mach_info::float_format ff
-                        = oct_mach_info::native_float_format (),
+                      octave::mach_info::float_format ff
+                        = octave::mach_info::native_float_format (),
                       c_file_ptr_buf::close_fcn cf = c_file_ptr_buf::file_close)
     : octave_tstdiostream<c_file_ptr_buf, io_c_file_ptr_stream, FILE *>
        (n, f, f ? fileno (f) : -1, m, ff, cf) { }
@@ -115,8 +115,8 @@
   static octave_stream
   create (const std::string& n, FILE *f = 0,
           std::ios::openmode m = std::ios::in | std::ios::out,
-          oct_mach_info::float_format ff
-            = oct_mach_info::native_float_format (),
+          octave::mach_info::float_format ff
+            = octave::mach_info::native_float_format (),
           c_file_ptr_buf::close_fcn cf = c_file_ptr_buf::file_close)
   {
     return octave_stream (new octave_stdiostream (n, f, m, ff, cf));
@@ -145,8 +145,8 @@
 
   octave_zstdiostream (const std::string& n, gzFile f = 0, int fid = 0,
                        std::ios::openmode m = std::ios::in | std::ios::out,
-                       oct_mach_info::float_format ff
-                         = oct_mach_info::native_float_format (),
+                       octave::mach_info::float_format ff
+                         = octave::mach_info::native_float_format (),
                        c_zfile_ptr_buf::close_fcn cf
                          = c_zfile_ptr_buf::file_close)
     : octave_tstdiostream<c_zfile_ptr_buf, io_c_zfile_ptr_stream, gzFile>
@@ -155,8 +155,8 @@
   static octave_stream
   create (const std::string& n, gzFile f = 0, int fid = 0,
           std::ios::openmode m = std::ios::in | std::ios::out,
-          oct_mach_info::float_format ff
-            = oct_mach_info::native_float_format (),
+          octave::mach_info::float_format ff
+            = octave::mach_info::native_float_format (),
           c_zfile_ptr_buf::close_fcn cf = c_zfile_ptr_buf::file_close)
   {
     return octave_stream (new octave_zstdiostream (n, f, fid, m, ff, cf));
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/oct-stream.cc
--- a/libinterp/corefcn/oct-stream.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/oct-stream.cc	Thu May 19 01:59:35 2016 -0400
@@ -6225,7 +6225,7 @@
                   octave_idx_type elts_read,
                   octave_idx_type nr, octave_idx_type nc, bool swap,
                   bool do_float_fmt_conv, bool do_NA_conv,
-                  oct_mach_info::float_format from_flt_fmt)
+                  octave::mach_info::float_format from_flt_fmt)
 {
   typedef typename DST_T::element_type dst_elt_type;
 
@@ -6252,7 +6252,7 @@
                   else if (do_float_fmt_conv)
                     do_float_format_conversion (&data[i], sizeof (SRC_T),
                                                 1, from_flt_fmt,
-                                                oct_mach_info::native_float_format ());
+                                                octave::mach_info::native_float_format ());
 
                   dst_elt_type tmp (data[i]);
 
@@ -6272,7 +6272,7 @@
                   else if (do_float_fmt_conv)
                     do_float_format_conversion (&data[i], sizeof (SRC_T),
                                                 1, from_flt_fmt,
-                                                oct_mach_info::native_float_format ());
+                                                octave::mach_info::native_float_format ());
 
                   conv_data[j] = data[i];
                 }
@@ -6316,7 +6316,7 @@
   (std::list<void *>& input_buf_list, octave_idx_type input_buf_elts,
    octave_idx_type elts_read, octave_idx_type nr, octave_idx_type nc,
    bool swap, bool do_float_fmt_conv, bool do_NA_conv,
-   oct_mach_info::float_format from_flt_fmt);
+   octave::mach_info::float_format from_flt_fmt);
 
 #define TABLE_ELT(T, U, V, W) \
   conv_fptr_table[oct_data_conv::T][oct_data_conv::U] = convert_and_copy<V, W>
@@ -6344,7 +6344,7 @@
                               octave_idx_type nr, octave_idx_type nc,
                               oct_data_conv::data_type input_type,
                               oct_data_conv::data_type output_type,
-                              oct_mach_info::float_format ffmt)
+                              octave::mach_info::float_format ffmt)
 {
   octave_value retval;
 
@@ -6380,13 +6380,13 @@
 
   bool swap = false;
 
-  if (ffmt == oct_mach_info::flt_fmt_unknown)
+  if (ffmt == octave::mach_info::flt_fmt_unknown)
     ffmt = float_format ();
 
-  if (oct_mach_info::words_big_endian ())
-    swap = (ffmt == oct_mach_info::flt_fmt_ieee_little_endian);
+  if (octave::mach_info::words_big_endian ())
+    swap = (ffmt == octave::mach_info::flt_fmt_ieee_little_endian);
   else
-    swap = (ffmt == oct_mach_info::flt_fmt_ieee_big_endian);
+    swap = (ffmt == octave::mach_info::flt_fmt_ieee_big_endian);
 
   bool do_float_fmt_conv = ((input_type == oct_data_conv::dt_double
                              || input_type == oct_data_conv::dt_single)
@@ -6429,7 +6429,7 @@
 octave_stream::read (const Array<double>& size, octave_idx_type block_size,
                      oct_data_conv::data_type input_type,
                      oct_data_conv::data_type output_type,
-                     octave_idx_type skip, oct_mach_info::float_format ffmt,
+                     octave_idx_type skip, octave::mach_info::float_format ffmt,
                      octave_idx_type& count)
 {
   octave_value retval;
@@ -6619,7 +6619,7 @@
 octave_idx_type
 octave_stream::write (const octave_value& data, octave_idx_type block_size,
                       oct_data_conv::data_type output_type,
-                      octave_idx_type skip, oct_mach_info::float_format flt_fmt)
+                      octave_idx_type skip, octave::mach_info::float_format flt_fmt)
 {
   octave_idx_type retval = -1;
 
@@ -6627,7 +6627,7 @@
     invalid_operation ("fwrite", "writing");
   else
     {
-      if (flt_fmt == oct_mach_info::flt_fmt_unknown)
+      if (flt_fmt == octave::mach_info::flt_fmt_unknown)
         flt_fmt = float_format ();
 
       octave_idx_type status = data.write (*this, block_size, output_type,
@@ -6693,16 +6693,16 @@
 static bool
 convert_data (const T *data, void *conv_data, octave_idx_type n_elts,
               oct_data_conv::data_type output_type,
-              oct_mach_info::float_format flt_fmt)
+              octave::mach_info::float_format flt_fmt)
 {
   bool retval = true;
 
   bool swap
-    = ((oct_mach_info::words_big_endian ()
-        && flt_fmt == oct_mach_info::flt_fmt_ieee_little_endian)
-       || flt_fmt == oct_mach_info::flt_fmt_ieee_big_endian);
-
-  bool do_float_conversion = flt_fmt != oct_mach_info::float_format ();
+    = ((octave::mach_info::words_big_endian ()
+        && flt_fmt == octave::mach_info::flt_fmt_ieee_little_endian)
+       || flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian);
+
+  bool do_float_conversion = flt_fmt != octave::mach_info::float_format ();
 
   typedef typename ultimate_element_type<T>::type ult_elt_type;
 
@@ -6858,14 +6858,14 @@
 octave_stream::write (const Array<T>& data, octave_idx_type block_size,
                       oct_data_conv::data_type output_type,
                       octave_idx_type skip,
-                      oct_mach_info::float_format flt_fmt)
-{
-  bool swap = ((oct_mach_info::words_big_endian ()
-                && flt_fmt == oct_mach_info::flt_fmt_ieee_little_endian)
-               || flt_fmt == oct_mach_info::flt_fmt_ieee_big_endian);
+                      octave::mach_info::float_format flt_fmt)
+{
+  bool swap = ((octave::mach_info::words_big_endian ()
+                && flt_fmt == octave::mach_info::flt_fmt_ieee_little_endian)
+               || flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian);
 
   bool do_data_conversion = (swap || ! is_equivalent_type<T> (output_type)
-                             || flt_fmt != oct_mach_info::float_format ());
+                             || flt_fmt != octave::mach_info::float_format ());
 
   octave_idx_type nel = data.numel ();
 
@@ -6928,7 +6928,7 @@
   octave_stream::write (const Array<T>& data, octave_idx_type block_size, \
                         oct_data_conv::data_type output_type, \
                         octave_idx_type skip, \
-                        oct_mach_info::float_format flt_fmt)
+                        octave::mach_info::float_format flt_fmt)
 
 INSTANTIATE_WRITE (octave_int8);
 INSTANTIATE_WRITE (octave_uint8);
@@ -7145,10 +7145,10 @@
   return retval;
 }
 
-oct_mach_info::float_format
+octave::mach_info::float_format
 octave_stream::float_format (void) const
 {
-  oct_mach_info::float_format retval = oct_mach_info::flt_fmt_unknown;
+  octave::mach_info::float_format retval = octave::mach_info::flt_fmt_unknown;
 
   if (stream_ok ())
     retval = rep->float_format ();
@@ -7457,7 +7457,7 @@
 
   retval(0) = os.name ();
   retval(1) = octave_stream::mode_as_string (os.mode ());
-  retval(2) = oct_mach_info::float_format_as_string (os.float_format ());
+  retval(2) = octave::mach_info::float_format_as_string (os.float_format ());
 
   return retval;
 }
@@ -7498,7 +7498,7 @@
           << octave_stream::mode_as_string (os.mode ())
           << "  "
           << std::setw (9)
-          << oct_mach_info::float_format_as_string (os.float_format ())
+          << octave::mach_info::float_format_as_string (os.float_format ())
           << "  "
           << os.name () << "\n";
     }
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/oct-stream.h
--- a/libinterp/corefcn/oct-stream.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/oct-stream.h	Thu May 19 01:59:35 2016 -0400
@@ -63,8 +63,8 @@
 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_float_format ())
+                      octave::mach_info::float_format ff
+                        = octave::mach_info::native_float_format ())
     : count (0), md (arg_md), flt_fmt (ff), fail (false), open_state (true),
       errmsg ()
   { }
@@ -141,7 +141,7 @@
 
   int mode (void) const { return md; }
 
-  oct_mach_info::float_format float_format (void) const { return flt_fmt; }
+  octave::mach_info::float_format float_format (void) const { return flt_fmt; }
 
   // Set current error state and set fail to TRUE.
 
@@ -166,7 +166,7 @@
   int md;
 
   // Data format.
-  oct_mach_info::float_format flt_fmt;
+  octave::mach_info::float_format flt_fmt;
 
   // TRUE if an error has occurred.
   bool fail;
@@ -281,13 +281,13 @@
   octave_value read (const Array<double>& size, octave_idx_type block_size,
                      oct_data_conv::data_type input_type,
                      oct_data_conv::data_type output_type,
-                     octave_idx_type skip, oct_mach_info::float_format flt_fmt,
+                     octave_idx_type skip, octave::mach_info::float_format flt_fmt,
                      octave_idx_type& count);
 
   octave_idx_type write (const octave_value& data, octave_idx_type block_size,
                          oct_data_conv::data_type output_type,
                          octave_idx_type skip,
-                         oct_mach_info::float_format flt_fmt);
+                         octave::mach_info::float_format flt_fmt);
 
   bool write_bytes (const void *data, size_t n_elts);
 
@@ -297,7 +297,7 @@
   octave_idx_type write (const Array<T>& data, octave_idx_type block_size,
                          oct_data_conv::data_type output_type,
                          octave_idx_type skip,
-                         oct_mach_info::float_format flt_fmt);
+                         octave::mach_info::float_format flt_fmt);
 
   octave_value scanf (const std::string& fmt, const Array<double>& size,
                       octave_idx_type& count, const std::string& who /* = "scanf" */);
@@ -356,7 +356,7 @@
 
   int mode (void) const;
 
-  oct_mach_info::float_format float_format (void) const;
+  octave::mach_info::float_format float_format (void) const;
 
   static std::string mode_as_string (int mode);
 
@@ -405,7 +405,7 @@
                  octave_idx_type nr, octave_idx_type nc,
                  oct_data_conv::data_type input_type,
                  oct_data_conv::data_type output_type,
-                 oct_mach_info::float_format ffmt);
+                 octave::mach_info::float_format ffmt);
 };
 
 class
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/oct-strstrm.cc
--- a/libinterp/corefcn/oct-strstrm.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/oct-strstrm.cc	Thu May 19 01:59:35 2016 -0400
@@ -50,21 +50,21 @@
 
 octave_stream
 octave_istrstream::create (const char *data, std::ios::openmode arg_md,
-                           oct_mach_info::float_format flt_fmt)
+                           octave::mach_info::float_format flt_fmt)
 {
   return octave_stream (new octave_istrstream (data, arg_md, flt_fmt));
 }
 
 octave_stream
 octave_istrstream::create (const std::string& data, std::ios::openmode arg_md,
-                           oct_mach_info::float_format flt_fmt)
+                           octave::mach_info::float_format flt_fmt)
 {
   return octave_stream (new octave_istrstream (data, arg_md, flt_fmt));
 }
 
 octave_stream
 octave_ostrstream::create (std::ios::openmode arg_md,
-                           oct_mach_info::float_format flt_fmt)
+                           octave::mach_info::float_format flt_fmt)
 {
   return octave_stream (new octave_ostrstream (arg_md, flt_fmt));
 }
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/oct-strstrm.h
--- a/libinterp/corefcn/oct-strstrm.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/oct-strstrm.h	Thu May 19 01:59:35 2016 -0400
@@ -36,8 +36,8 @@
 public:
 
   octave_base_strstream (std::ios::openmode m = std::ios::out,
-                         oct_mach_info::float_format ff
-                           = oct_mach_info::native_float_format ())
+                         octave::mach_info::float_format ff
+                           = octave::mach_info::native_float_format ())
     : octave_base_stream (m, ff) { }
 
   // Position a stream at OFFSET relative to ORIGIN.
@@ -78,25 +78,25 @@
 
   octave_istrstream (const char *data,
                      std::ios::openmode arg_md = std::ios::out,
-                     oct_mach_info::float_format ff
-                       = oct_mach_info::native_float_format ())
+                     octave::mach_info::float_format ff
+                       = octave::mach_info::native_float_format ())
     : octave_base_strstream (arg_md, ff), is (data) { }
 
   octave_istrstream (const std::string& data,
                      std::ios::openmode arg_md = std::ios::out,
-                     oct_mach_info::float_format ff
-                       = oct_mach_info::native_float_format ())
+                     octave::mach_info::float_format ff
+                       = octave::mach_info::native_float_format ())
     : octave_base_strstream (arg_md, ff), is (data.c_str ()) { }
 
   static octave_stream
   create (const char *data, std::ios::openmode arg_md = std::ios::out,
-          oct_mach_info::float_format ff
-            = oct_mach_info::native_float_format ());
+          octave::mach_info::float_format ff
+            = octave::mach_info::native_float_format ());
 
   static octave_stream
   create (const std::string& data, std::ios::openmode arg_md = std::ios::out,
-          oct_mach_info::float_format ff
-            = oct_mach_info::native_float_format ());
+          octave::mach_info::float_format ff
+            = octave::mach_info::native_float_format ());
 
   // Return nonzero if EOF has been reached on this stream.
 
@@ -135,14 +135,14 @@
 public:
 
   octave_ostrstream (std::ios::openmode arg_md = std::ios::out,
-                     oct_mach_info::float_format ff
-                       = oct_mach_info::native_float_format ())
+                     octave::mach_info::float_format ff
+                       = octave::mach_info::native_float_format ())
     : octave_base_strstream (arg_md, ff), os () { }
 
   static octave_stream
   create (std::ios::openmode arg_md = std::ios::out,
-          oct_mach_info::float_format ff
-            = oct_mach_info::native_float_format ());
+          octave::mach_info::float_format ff
+            = octave::mach_info::native_float_format ());
 
   // Return nonzero if EOF has been reached on this stream.
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/pr-output.cc
--- a/libinterp/corefcn/pr-output.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/pr-output.cc	Thu May 19 01:59:35 2016 -0400
@@ -1477,14 +1477,14 @@
           // interrupted before resetting the format flags and fill
           // character?
 
-          oct_mach_info::float_format flt_fmt =
-            oct_mach_info::native_float_format ();
+          octave::mach_info::float_format flt_fmt =
+            octave::mach_info::native_float_format ();
 
           os.fill ('0');
           os.flags (std::ios::right | std::ios::hex);
 
           if (hex_format > 1
-              || flt_fmt == oct_mach_info::flt_fmt_ieee_big_endian)
+              || flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian)
             {
               for (size_t i = 0; i < sizeof (double); i++)
                 os << std::setw (2) << static_cast<int> (tmp.i[i]);
@@ -1500,10 +1500,10 @@
           equiv tmp;
           tmp.d = d;
 
-          oct_mach_info::float_format flt_fmt =
-            oct_mach_info::native_float_format ();
-
-          if (flt_fmt == oct_mach_info::flt_fmt_ieee_big_endian)
+          octave::mach_info::float_format flt_fmt =
+            octave::mach_info::native_float_format ();
+
+          if (flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian)
             {
               for (size_t i = 0; i < sizeof (double); i++)
                 PRINT_CHAR_BITS (os, tmp.i[i]);
@@ -3011,7 +3011,7 @@
 
       os.flags (std::ios::right | std::ios::hex);
 
-      if (hex_format > 1 || oct_mach_info::words_big_endian ())
+      if (hex_format > 1 || octave::mach_info::words_big_endian ())
         {
           for (size_t i = 0; i < sz; i++)
             os << std::setw (2) << static_cast<int> (tmpi[i]);
@@ -3024,7 +3024,7 @@
     }
   else if (bit_format)
     {
-      if (oct_mach_info::words_big_endian ())
+      if (octave::mach_info::words_big_endian ())
         {
           for (size_t i = 0; i < sz; i++)
             PRINT_CHAR_BITS (os, tmpi[i]);
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/sysdep.cc
--- a/libinterp/corefcn/sysdep.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/sysdep.cc	Thu May 19 01:59:35 2016 -0400
@@ -839,10 +839,10 @@
 No actual tests are performed.\n\
 @end deftypefn")
 {
-  oct_mach_info::float_format flt_fmt = oct_mach_info::native_float_format ();
+  octave::mach_info::float_format flt_fmt = octave::mach_info::native_float_format ();
 
-  return ovl (flt_fmt == oct_mach_info::flt_fmt_ieee_little_endian
-              || flt_fmt == oct_mach_info::flt_fmt_ieee_big_endian);
+  return ovl (flt_fmt == octave::mach_info::flt_fmt_ieee_little_endian
+              || flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian);
 }
 
 /*
@@ -855,9 +855,9 @@
 Return the native floating point format as a string.\n\
 @end deftypefn")
 {
-  oct_mach_info::float_format flt_fmt = oct_mach_info::native_float_format ();
+  octave::mach_info::float_format flt_fmt = octave::mach_info::native_float_format ();
 
-  return ovl (oct_mach_info::float_format_as_string (flt_fmt));
+  return ovl (octave::mach_info::float_format_as_string (flt_fmt));
 }
 
 /*
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/corefcn/toplev.cc
--- a/libinterp/corefcn/toplev.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/corefcn/toplev.cc	Thu May 19 01:59:35 2016 -0400
@@ -1669,15 +1669,15 @@
 
       config.assign ("dld", octave_value (octave_supports_dynamic_linking));
 
-      oct_mach_info::float_format ff = oct_mach_info::native_float_format ();
+      octave::mach_info::float_format ff = octave::mach_info::native_float_format ();
       config.assign ("float_format",
-                     octave_value (oct_mach_info::float_format_as_string (ff)));
+                     octave_value (octave::mach_info::float_format_as_string (ff)));
 
       config.assign ("words_big_endian",
-                     octave_value (oct_mach_info::words_big_endian ()));
+                     octave_value (octave::mach_info::words_big_endian ()));
 
       config.assign ("words_little_endian",
-                     octave_value (oct_mach_info::words_little_endian ()));
+                     octave_value (octave::mach_info::words_little_endian ()));
 
       config.assign ("build_environment", octave_value (build_env));
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/dldfcn/audiodevinfo.cc
--- a/libinterp/dldfcn/audiodevinfo.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/dldfcn/audiodevinfo.cc	Thu May 19 01:59:35 2016 -0400
@@ -597,7 +597,7 @@
       {
         static double scale_factor = std::pow (2.0, 23) - 1.0;
 
-        static int big_endian = oct_mach_info::words_big_endian ();
+        static int big_endian = octave::mach_info::words_big_endian ();
 
         uint8_t *buffer = static_cast<uint8_t *> (output);
 
@@ -709,7 +709,7 @@
           {
             static double scale_factor = std::pow (2.0, 23) - 1.0;
 
-            static int big_endian = oct_mach_info::words_big_endian ();
+            static int big_endian = octave::mach_info::words_big_endian ();
 
             uint8_t *buffer = static_cast<uint8_t *> (output);
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-base-diag.cc
--- a/libinterp/octave-value/ov-base-diag.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-base-diag.cc	Thu May 19 01:59:35 2016 -0400
@@ -552,7 +552,7 @@
 octave_base_diag<DMT, MT>::write (octave_stream& os, int block_size,
                                   oct_data_conv::data_type output_type,
                                   int skip,
-                                  oct_mach_info::float_format flt_fmt) const
+                                  octave::mach_info::float_format flt_fmt) const
 {
   return to_dense ().write (os, block_size, output_type, skip, flt_fmt);
 }
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-base-diag.h
--- a/libinterp/octave-value/ov-base-diag.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-base-diag.h	Thu May 19 01:59:35 2016 -0400
@@ -206,7 +206,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const;
+             octave::mach_info::float_format flt_fmt) const;
 
   mxArray *as_mxArray (void) const;
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-base-int.cc
--- a/libinterp/octave-value/ov-base-int.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-base-int.cc	Thu May 19 01:59:35 2016 -0400
@@ -256,7 +256,7 @@
 template <typename T>
 bool
 octave_base_int_matrix<T>::load_binary (std::istream& is, bool swap,
-                                        oct_mach_info::float_format)
+                                        octave::mach_info::float_format)
 {
   int32_t mdims;
   if (! is.read (reinterpret_cast<char *> (&mdims), 4))
@@ -520,7 +520,7 @@
 template <typename T>
 bool
 octave_base_int_scalar<T>::load_binary (std::istream& is, bool swap,
-                                        oct_mach_info::float_format)
+                                        octave::mach_info::float_format)
 {
   T tmp;
   if (! is.read (reinterpret_cast<char *> (&tmp), this->byte_size ()))
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-base-int.h
--- a/libinterp/octave-value/ov-base-int.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-base-int.h	Thu May 19 01:59:35 2016 -0400
@@ -78,7 +78,7 @@
   bool save_binary (std::ostream& os, bool&);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format);
+                    octave::mach_info::float_format);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool);
 
@@ -123,7 +123,7 @@
   bool save_binary (std::ostream& os, bool&);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format);
+                    octave::mach_info::float_format);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool);
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-base.cc
--- a/libinterp/octave-value/ov-base.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-base.cc	Thu May 19 01:59:35 2016 -0400
@@ -939,7 +939,7 @@
 
 bool
 octave_base_value::load_binary (std::istream&, bool,
-                                oct_mach_info::float_format)
+                                octave::mach_info::float_format)
 {
   err_wrong_type_arg ("octave_base_value::load_binary()", type_name ());
 }
@@ -958,7 +958,7 @@
 
 int
 octave_base_value::write (octave_stream&, int, oct_data_conv::data_type,
-                          int, oct_mach_info::float_format) const
+                          int, octave::mach_info::float_format) const
 {
   err_wrong_type_arg ("octave_base_value::write()", type_name ());
 }
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-base.h
--- a/libinterp/octave-value/ov-base.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-base.h	Thu May 19 01:59:35 2016 -0400
@@ -645,7 +645,7 @@
   virtual bool save_binary (std::ostream& os, bool& save_as_floats);
 
   virtual bool load_binary (std::istream& is, bool swap,
-                            oct_mach_info::float_format fmt);
+                            octave::mach_info::float_format fmt);
 
   virtual bool
   save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
@@ -656,7 +656,7 @@
   virtual int
   write (octave_stream& os, int block_size,
          oct_data_conv::data_type output_type, int skip,
-         oct_mach_info::float_format flt_fmt) const;
+         octave::mach_info::float_format flt_fmt) const;
 
   virtual void *mex_get_data (void) const { return 0; }
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-bool-mat.cc
--- a/libinterp/octave-value/ov-bool-mat.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-bool-mat.cc	Thu May 19 01:59:35 2016 -0400
@@ -317,7 +317,7 @@
 
 bool
 octave_bool_matrix::load_binary (std::istream& is, bool swap,
-                                 oct_mach_info::float_format /* fmt */)
+                                 octave::mach_info::float_format /* fmt */)
 {
   int32_t mdims;
   if (! is.read (reinterpret_cast<char *> (&mdims), 4))
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-bool-mat.h
--- a/libinterp/octave-value/ov-bool-mat.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-bool-mat.h	Thu May 19 01:59:35 2016 -0400
@@ -205,7 +205,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
@@ -213,7 +213,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   { return os.write (matrix, block_size, output_type, skip, flt_fmt); }
 
   // Unsafe.  This function exists to support the MEX interface.
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-bool-sparse.cc
--- a/libinterp/octave-value/ov-bool-sparse.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-bool-sparse.cc	Thu May 19 01:59:35 2016 -0400
@@ -262,7 +262,7 @@
 
 bool
 octave_sparse_bool_matrix::load_binary (std::istream& is, bool swap,
-                                        oct_mach_info::float_format /* fmt */)
+                                        octave::mach_info::float_format /* fmt */)
 {
   int32_t nz, nc, nr, tmp;
   if (! is.read (reinterpret_cast<char *> (&tmp), 4))
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-bool-sparse.h
--- a/libinterp/octave-value/ov-bool-sparse.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-bool-sparse.h	Thu May 19 01:59:35 2016 -0400
@@ -135,7 +135,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-bool.cc
--- a/libinterp/octave-value/ov-bool.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-bool.cc	Thu May 19 01:59:35 2016 -0400
@@ -152,7 +152,7 @@
 
 bool
 octave_bool::load_binary (std::istream& is, bool /* swap */,
-                          oct_mach_info::float_format /* fmt */)
+                          octave::mach_info::float_format /* fmt */)
 {
   char tmp;
   if (! is.read (reinterpret_cast<char *> (&tmp), 1))
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-bool.h
--- a/libinterp/octave-value/ov-bool.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-bool.h	Thu May 19 01:59:35 2016 -0400
@@ -218,7 +218,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
@@ -226,7 +226,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   {
     return os.write (bool_array_value (), block_size, output_type,
                      skip, flt_fmt);
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-cell.cc
--- a/libinterp/octave-value/ov-cell.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-cell.cc	Thu May 19 01:59:35 2016 -0400
@@ -889,7 +889,7 @@
 
 bool
 octave_cell::load_binary (std::istream& is, bool swap,
-                          oct_mach_info::float_format fmt)
+                          octave::mach_info::float_format fmt)
 {
   clear_cellstr_cache ();
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-cell.h
--- a/libinterp/octave-value/ov-cell.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-cell.h	Thu May 19 01:59:35 2016 -0400
@@ -163,7 +163,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-class.cc
--- a/libinterp/octave-value/ov-class.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-class.cc	Thu May 19 01:59:35 2016 -0400
@@ -1312,7 +1312,7 @@
 
 bool
 octave_class::load_binary (std::istream& is, bool swap,
-                           oct_mach_info::float_format fmt)
+                           octave::mach_info::float_format fmt)
 {
   bool success = true;
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-class.h
--- a/libinterp/octave-value/ov-class.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-class.h	Thu May 19 01:59:35 2016 -0400
@@ -196,7 +196,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-complex.cc
--- a/libinterp/octave-value/ov-complex.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-complex.cc	Thu May 19 01:59:35 2016 -0400
@@ -331,7 +331,7 @@
 
 bool
 octave_complex::load_binary (std::istream& is, bool swap,
-                             oct_mach_info::float_format fmt)
+                             octave::mach_info::float_format fmt)
 {
   char tmp;
   if (! is.read (reinterpret_cast<char *> (&tmp), 1))
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-complex.h
--- a/libinterp/octave-value/ov-complex.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-complex.h	Thu May 19 01:59:35 2016 -0400
@@ -171,7 +171,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
@@ -179,7 +179,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   {
     // Yes, for compatibility, we drop the imaginary part here.
     return os.write (array_value (true), block_size, output_type,
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-cx-diag.cc
--- a/libinterp/octave-value/ov-cx-diag.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-cx-diag.cc	Thu May 19 01:59:35 2016 -0400
@@ -199,7 +199,7 @@
 
 bool
 octave_complex_diag_matrix::load_binary (std::istream& is, bool swap,
-                                         oct_mach_info::float_format fmt)
+                                         octave::mach_info::float_format fmt)
 {
   int32_t r, c;
   char tmp;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-cx-diag.h
--- a/libinterp/octave-value/ov-cx-diag.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-cx-diag.h	Thu May 19 01:59:35 2016 -0400
@@ -82,7 +82,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   octave_value map (unary_mapper_t umap) const;
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-cx-mat.cc
--- a/libinterp/octave-value/ov-cx-mat.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-cx-mat.cc	Thu May 19 01:59:35 2016 -0400
@@ -452,7 +452,7 @@
 
 bool
 octave_complex_matrix::load_binary (std::istream& is, bool swap,
-                                    oct_mach_info::float_format fmt)
+                                    octave::mach_info::float_format fmt)
 {
   char tmp;
   int32_t mdims;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-cx-mat.h
--- a/libinterp/octave-value/ov-cx-mat.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-cx-mat.h	Thu May 19 01:59:35 2016 -0400
@@ -155,7 +155,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
@@ -163,7 +163,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   {
     // Yes, for compatibility, we drop the imaginary part here.
     return os.write (matrix_value (true), block_size, output_type,
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-cx-sparse.cc
--- a/libinterp/octave-value/ov-cx-sparse.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-cx-sparse.cc	Thu May 19 01:59:35 2016 -0400
@@ -292,7 +292,7 @@
 
 bool
 octave_sparse_complex_matrix::load_binary (std::istream& is, bool swap,
-                                           oct_mach_info::float_format fmt)
+                                           octave::mach_info::float_format fmt)
 {
   int32_t nz, nc, nr, tmp;
   char ctmp;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-cx-sparse.h
--- a/libinterp/octave-value/ov-cx-sparse.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-cx-sparse.h	Thu May 19 01:59:35 2016 -0400
@@ -130,7 +130,7 @@
 #if 0
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   {
     // Yes, for compatibility, we drop the imaginary part here.
     return os.write (matrix_value (true), block_size, output_type,
@@ -141,7 +141,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-fcn-handle.cc
--- a/libinterp/octave-value/ov-fcn-handle.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-fcn-handle.cc	Thu May 19 01:59:35 2016 -0400
@@ -564,7 +564,7 @@
 
 bool
 octave_fcn_handle::load_binary (std::istream& is, bool swap,
-                                oct_mach_info::float_format fmt)
+                                octave::mach_info::float_format fmt)
 {
   bool success = true;
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-fcn-handle.h
--- a/libinterp/octave-value/ov-fcn-handle.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-fcn-handle.h	Thu May 19 01:59:35 2016 -0400
@@ -146,7 +146,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-fcn-inline.cc
--- a/libinterp/octave-value/ov-fcn-inline.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-fcn-inline.cc	Thu May 19 01:59:35 2016 -0400
@@ -214,7 +214,7 @@
 
 bool
 octave_fcn_inline::load_binary (std::istream& is, bool swap,
-                                oct_mach_info::float_format)
+                                octave::mach_info::float_format)
 {
   int32_t nargs;
   if (! is.read (reinterpret_cast<char *> (&nargs), 4))
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-fcn-inline.h
--- a/libinterp/octave-value/ov-fcn-inline.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-fcn-inline.h	Thu May 19 01:59:35 2016 -0400
@@ -79,7 +79,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-float.cc
--- a/libinterp/octave-value/ov-float.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-float.cc	Thu May 19 01:59:35 2016 -0400
@@ -164,7 +164,7 @@
 
 bool
 octave_float_scalar::load_binary (std::istream& is, bool swap,
-                                  oct_mach_info::float_format fmt)
+                                  octave::mach_info::float_format fmt)
 {
   char tmp;
   if (! is.read (reinterpret_cast<char *> (&tmp), 1))
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-float.h
--- a/libinterp/octave-value/ov-float.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-float.h	Thu May 19 01:59:35 2016 -0400
@@ -231,7 +231,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
@@ -239,7 +239,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   {
     return os.write (array_value (), block_size, output_type,
                      skip, flt_fmt);
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-flt-complex.cc
--- a/libinterp/octave-value/ov-flt-complex.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-flt-complex.cc	Thu May 19 01:59:35 2016 -0400
@@ -281,7 +281,7 @@
 
 bool
 octave_float_complex::load_binary (std::istream& is, bool swap,
-                                   oct_mach_info::float_format fmt)
+                                   octave::mach_info::float_format fmt)
 {
   char tmp;
   if (! is.read (reinterpret_cast<char *> (&tmp), 1))
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-flt-complex.h
--- a/libinterp/octave-value/ov-flt-complex.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-flt-complex.h	Thu May 19 01:59:35 2016 -0400
@@ -167,7 +167,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
@@ -175,7 +175,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   {
     // Yes, for compatibility, we drop the imaginary part here.
     return os.write (array_value (true), block_size, output_type,
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-flt-cx-diag.cc
--- a/libinterp/octave-value/ov-flt-cx-diag.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-flt-cx-diag.cc	Thu May 19 01:59:35 2016 -0400
@@ -171,7 +171,7 @@
 
 bool
 octave_float_complex_diag_matrix::load_binary (std::istream& is, bool swap,
-                                               oct_mach_info::float_format fmt)
+                                               octave::mach_info::float_format fmt)
 {
   int32_t r, c;
   char tmp;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-flt-cx-diag.h
--- a/libinterp/octave-value/ov-flt-cx-diag.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-flt-cx-diag.h	Thu May 19 01:59:35 2016 -0400
@@ -80,7 +80,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   octave_value map (unary_mapper_t umap) const;
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-flt-cx-mat.cc
--- a/libinterp/octave-value/ov-flt-cx-mat.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-flt-cx-mat.cc	Thu May 19 01:59:35 2016 -0400
@@ -415,7 +415,7 @@
 
 bool
 octave_float_complex_matrix::load_binary (std::istream& is, bool swap,
-                                          oct_mach_info::float_format fmt)
+                                          octave::mach_info::float_format fmt)
 {
   char tmp;
   int32_t mdims;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-flt-cx-mat.h
--- a/libinterp/octave-value/ov-flt-cx-mat.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-flt-cx-mat.h	Thu May 19 01:59:35 2016 -0400
@@ -151,7 +151,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
@@ -159,7 +159,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   {
     // Yes, for compatibility, we drop the imaginary part here.
     return os.write (matrix_value (true), block_size, output_type,
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-flt-re-diag.cc
--- a/libinterp/octave-value/ov-flt-re-diag.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-flt-re-diag.cc	Thu May 19 01:59:35 2016 -0400
@@ -140,7 +140,7 @@
 
 bool
 octave_float_diag_matrix::load_binary (std::istream& is, bool swap,
-                                       oct_mach_info::float_format fmt)
+                                       octave::mach_info::float_format fmt)
 {
   int32_t r, c;
   char tmp;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-flt-re-diag.h
--- a/libinterp/octave-value/ov-flt-re-diag.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-flt-re-diag.h	Thu May 19 01:59:35 2016 -0400
@@ -80,7 +80,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   octave_value map (unary_mapper_t umap) const;
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-flt-re-mat.cc
--- a/libinterp/octave-value/ov-flt-re-mat.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-flt-re-mat.cc	Thu May 19 01:59:35 2016 -0400
@@ -436,7 +436,7 @@
 
 bool
 octave_float_matrix::load_binary (std::istream& is, bool swap,
-                                  oct_mach_info::float_format fmt)
+                                  octave::mach_info::float_format fmt)
 {
   char tmp;
   int32_t mdims;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-flt-re-mat.h
--- a/libinterp/octave-value/ov-flt-re-mat.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-flt-re-mat.h	Thu May 19 01:59:35 2016 -0400
@@ -189,7 +189,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
@@ -197,7 +197,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   { return os.write (matrix, block_size, output_type, skip, flt_fmt); }
 
   // Unsafe.  This function exists to support the MEX interface.
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-intx.h
--- a/libinterp/octave-value/ov-intx.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-intx.h	Thu May 19 01:59:35 2016 -0400
@@ -306,7 +306,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   { return os.write (matrix, block_size, output_type, skip, flt_fmt); }
 
   // Unsafe.  This function exists to support the MEX interface.
@@ -614,7 +614,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, octave_idx_type skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   {
     return os.write (OCTAVE_VALUE_INT_NDARRAY_EXTRACTOR_FUNCTION (),
                      block_size, output_type, skip, flt_fmt);
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-java.cc
--- a/libinterp/octave-value/ov-java.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-java.cc	Thu May 19 01:59:35 2016 -0400
@@ -2110,7 +2110,7 @@
 
 bool
 octave_java::load_binary (std::istream& /* is */, bool /* swap*/,
-                          oct_mach_info::float_format /* fmt */)
+                          octave::mach_info::float_format /* fmt */)
 {
   // Silently skip over java object that was not saved
   return true;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-java.h
--- a/libinterp/octave-value/ov-java.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-java.h	Thu May 19 01:59:35 2016 -0400
@@ -79,7 +79,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name,
                   bool save_as_floats);
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-lazy-idx.cc
--- a/libinterp/octave-value/ov-lazy-idx.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-lazy-idx.cc	Thu May 19 01:59:35 2016 -0400
@@ -185,7 +185,7 @@
 }
 
 bool octave_lazy_index::load_binary (std::istream& is, bool swap,
-                                     oct_mach_info::float_format fmt)
+                                     octave::mach_info::float_format fmt)
 {
   bool dummy;
   std::string doc;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-lazy-idx.h
--- a/libinterp/octave-value/ov-lazy-idx.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-lazy-idx.h	Thu May 19 01:59:35 2016 -0400
@@ -205,12 +205,12 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   { return make_value ().write (os, block_size, output_type, skip, flt_fmt); }
 
   // Unsafe.  This function exists to support the MEX interface.
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-oncleanup.cc
--- a/libinterp/octave-value/ov-oncleanup.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-oncleanup.cc	Thu May 19 01:59:35 2016 -0400
@@ -132,7 +132,7 @@
 
 bool
 octave_oncleanup::load_binary (std::istream& /* is */, bool /* swap */,
-                               oct_mach_info::float_format /* fmt */)
+                               octave::mach_info::float_format /* fmt */)
 {
   // Silently skip object that was not saved
   return true;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-oncleanup.h
--- a/libinterp/octave-value/ov-oncleanup.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-oncleanup.h	Thu May 19 01:59:35 2016 -0400
@@ -75,7 +75,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-perm.cc
--- a/libinterp/octave-value/ov-perm.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-perm.cc	Thu May 19 01:59:35 2016 -0400
@@ -314,7 +314,7 @@
 
 bool
 octave_perm_matrix::load_binary (std::istream& is, bool swap,
-                                 oct_mach_info::float_format)
+                                 octave::mach_info::float_format)
 {
   int32_t sz;
   bool colp;
@@ -384,7 +384,7 @@
 int
 octave_perm_matrix::write (octave_stream& os, int block_size,
                            oct_data_conv::data_type output_type, int skip,
-                           oct_mach_info::float_format flt_fmt) const
+                           octave::mach_info::float_format flt_fmt) const
 {
   return to_dense ().write (os, block_size, output_type, skip, flt_fmt);
 }
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-perm.h
--- a/libinterp/octave-value/ov-perm.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-perm.h	Thu May 19 01:59:35 2016 -0400
@@ -203,11 +203,11 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const;
+             octave::mach_info::float_format flt_fmt) const;
 
   mxArray *as_mxArray (void) const;
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-range.cc
--- a/libinterp/octave-value/ov-range.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-range.cc	Thu May 19 01:59:35 2016 -0400
@@ -496,7 +496,7 @@
 
 bool
 octave_range::load_binary (std::istream& is, bool swap,
-                           oct_mach_info::float_format /* fmt */)
+                           octave::mach_info::float_format /* fmt */)
 {
   char tmp;
   if (! is.read (reinterpret_cast<char *> (&tmp), 1))
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-range.h
--- a/libinterp/octave-value/ov-range.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-range.h	Thu May 19 01:59:35 2016 -0400
@@ -265,7 +265,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
@@ -273,7 +273,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   {
     // FIXME: could be more memory efficient by having a
     // special case of the octave_stream::write method for ranges.
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-re-diag.cc
--- a/libinterp/octave-value/ov-re-diag.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-re-diag.cc	Thu May 19 01:59:35 2016 -0400
@@ -217,7 +217,7 @@
 
 bool
 octave_diag_matrix::load_binary (std::istream& is, bool swap,
-                                 oct_mach_info::float_format fmt)
+                                 octave::mach_info::float_format fmt)
 {
   int32_t r, c;
   char tmp;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-re-diag.h
--- a/libinterp/octave-value/ov-re-diag.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-re-diag.h	Thu May 19 01:59:35 2016 -0400
@@ -85,7 +85,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   octave_value map (unary_mapper_t umap) const;
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-re-mat.cc
--- a/libinterp/octave-value/ov-re-mat.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-re-mat.cc	Thu May 19 01:59:35 2016 -0400
@@ -549,7 +549,7 @@
 
 bool
 octave_matrix::load_binary (std::istream& is, bool swap,
-                            oct_mach_info::float_format fmt)
+                            octave::mach_info::float_format fmt)
 {
   char tmp;
   int32_t mdims;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-re-mat.h
--- a/libinterp/octave-value/ov-re-mat.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-re-mat.h	Thu May 19 01:59:35 2016 -0400
@@ -213,7 +213,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
@@ -221,7 +221,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   { return os.write (matrix, block_size, output_type, skip, flt_fmt); }
 
   // Unsafe.  This function exists to support the MEX interface.
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-re-sparse.cc
--- a/libinterp/octave-value/ov-re-sparse.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-re-sparse.cc	Thu May 19 01:59:35 2016 -0400
@@ -315,7 +315,7 @@
 
 bool
 octave_sparse_matrix::load_binary (std::istream& is, bool swap,
-                                   oct_mach_info::float_format fmt)
+                                   octave::mach_info::float_format fmt)
 {
   int32_t nz, nc, nr, tmp;
   char ctmp;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-re-sparse.h
--- a/libinterp/octave-value/ov-re-sparse.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-re-sparse.h	Thu May 19 01:59:35 2016 -0400
@@ -137,14 +137,14 @@
 #if 0
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   { return os.write (matrix, block_size, output_type, skip, flt_fmt); }
 #endif
 
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-scalar.cc
--- a/libinterp/octave-value/ov-scalar.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-scalar.cc	Thu May 19 01:59:35 2016 -0400
@@ -186,7 +186,7 @@
 
 bool
 octave_scalar::load_binary (std::istream& is, bool swap,
-                            oct_mach_info::float_format fmt)
+                            octave::mach_info::float_format fmt)
 {
   char tmp;
   if (! is.read (reinterpret_cast<char *> (&tmp), 1))
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-scalar.h
--- a/libinterp/octave-value/ov-scalar.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-scalar.h	Thu May 19 01:59:35 2016 -0400
@@ -230,7 +230,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
@@ -238,7 +238,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   {
     return os.write (array_value (), block_size, output_type,
                      skip, flt_fmt);
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-str-mat.cc
--- a/libinterp/octave-value/ov-str-mat.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-str-mat.cc	Thu May 19 01:59:35 2016 -0400
@@ -455,7 +455,7 @@
 
 bool
 octave_char_matrix_str::load_binary (std::istream& is, bool swap,
-                                     oct_mach_info::float_format /* fmt */)
+                                     octave::mach_info::float_format /* fmt */)
 {
   int32_t elements;
   if (! is.read (reinterpret_cast<char *> (&elements), 4))
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-str-mat.h
--- a/libinterp/octave-value/ov-str-mat.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-str-mat.h	Thu May 19 01:59:35 2016 -0400
@@ -155,7 +155,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
@@ -163,7 +163,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const
+             octave::mach_info::float_format flt_fmt) const
   { return os.write (matrix, block_size, output_type, skip, flt_fmt); }
 
 protected:
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-struct.cc
--- a/libinterp/octave-value/ov-struct.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-struct.cc	Thu May 19 01:59:35 2016 -0400
@@ -801,7 +801,7 @@
 
 bool
 octave_struct::load_binary (std::istream& is, bool swap,
-                            oct_mach_info::float_format fmt)
+                            octave::mach_info::float_format fmt)
 {
   bool success = true;
   int32_t len;
@@ -1432,7 +1432,7 @@
 
 bool
 octave_scalar_struct::load_binary (std::istream& is, bool swap,
-                                   oct_mach_info::float_format fmt)
+                                   octave::mach_info::float_format fmt)
 {
   bool success = true;
   int32_t len;
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov-struct.h
--- a/libinterp/octave-value/ov-struct.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov-struct.h	Thu May 19 01:59:35 2016 -0400
@@ -140,7 +140,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
@@ -260,7 +260,7 @@
   bool save_binary (std::ostream& os, bool& save_as_floats);
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt);
+                    octave::mach_info::float_format fmt);
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
 
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov.cc
--- a/libinterp/octave-value/ov.cc	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov.cc	Thu May 19 01:59:35 2016 -0400
@@ -1938,7 +1938,7 @@
 int
 octave_value::write (octave_stream& os, int block_size,
                      oct_data_conv::data_type output_type, int skip,
-                     oct_mach_info::float_format flt_fmt) const
+                     octave::mach_info::float_format flt_fmt) const
 {
   return rep->write (os, block_size, output_type, skip, flt_fmt);
 }
diff -r a99c2407f930 -r c4ab2e54f100 libinterp/octave-value/ov.h
--- a/libinterp/octave-value/ov.h	Thu May 19 01:50:04 2016 -0400
+++ b/libinterp/octave-value/ov.h	Thu May 19 01:59:35 2016 -0400
@@ -1271,7 +1271,7 @@
   { return rep->save_binary (os, save_as_floats); }
 
   bool load_binary (std::istream& is, bool swap,
-                    oct_mach_info::float_format fmt)
+                    octave::mach_info::float_format fmt)
   { return rep->load_binary (is, swap, fmt); }
 
   bool save_hdf5 (octave_hdf5_id loc_id, const char *name,
@@ -1283,7 +1283,7 @@
 
   int write (octave_stream& os, int block_size,
              oct_data_conv::data_type output_type, int skip,
-             oct_mach_info::float_format flt_fmt) const;
+             octave::mach_info::float_format flt_fmt) const;
 
   octave_base_value *internal_rep (void) const { return rep; }
 
diff -r a99c2407f930 -r c4ab2e54f100 liboctave/numeric/oct-rand.cc
--- a/liboctave/numeric/oct-rand.cc	Thu May 19 01:50:04 2016 -0400
+++ b/liboctave/numeric/oct-rand.cc	Thu May 19 01:59:35 2016 -0400
@@ -110,11 +110,11 @@
   union d2i { double d; int32_t i[2]; };
   union d2i u;
 
-  oct_mach_info::float_format ff = oct_mach_info::native_float_format ();
+  octave::mach_info::float_format ff = octave::mach_info::native_float_format ();
 
   switch (ff)
     {
-    case oct_mach_info::flt_fmt_ieee_big_endian:
+    case octave::mach_info::flt_fmt_ieee_big_endian:
       F77_FUNC (getsd, GETSD) (u.i[1], u.i[0]);
       break;
     default:
@@ -150,11 +150,11 @@
   union d2i u;
   u.d = s;
 
-  oct_mach_info::float_format ff = oct_mach_info::native_float_format ();
+  octave::mach_info::float_format ff = octave::mach_info::native_float_format ();
 
   switch (ff)
     {
-    case oct_mach_info::flt_fmt_ieee_big_endian:
+    case octave::mach_info::flt_fmt_ieee_big_endian:
       i1 = force_to_fit_range (u.i[0], 1, 2147483563);
       i0 = force_to_fit_range (u.i[1], 1, 2147483399);
       break;
diff -r a99c2407f930 -r c4ab2e54f100 liboctave/system/mach-info.cc
--- a/liboctave/system/mach-info.cc	Thu May 19 01:50:04 2016 -0400
+++ b/liboctave/system/mach-info.cc	Thu May 19 01:59:35 2016 -0400
@@ -34,186 +34,189 @@
   double F77_FUNC (d1mach, D1MACH) (const octave_idx_type&);
 }
 
-oct_mach_info *oct_mach_info::instance = 0;
-
-union equiv
+namespace octave
 {
-  double d;
-  int i[2];
-};
+  mach_info *mach_info::instance = 0;
 
-struct
-float_params
-{
-  oct_mach_info::float_format fp_fmt;
-  equiv fp_par[4];
-};
+  union equiv
+  {
+    double d;
+    int i[2];
+  };
+
+  struct
+  float_params
+  {
+    mach_info::float_format fp_fmt;
+    equiv fp_par[4];
+  };
 
-#define INIT_FLT_PAR(fp, fmt, sm1, sm2, lrg1, lrg2, rt1, rt2, dv1, dv2) \
-  do \
-    { \
-      fp.fp_fmt = (fmt); \
-      fp.fp_par[0].i[0] = (sm1);  fp.fp_par[0].i[1] = (sm2); \
-      fp.fp_par[1].i[0] = (lrg1); fp.fp_par[1].i[1] = (lrg2); \
-      fp.fp_par[2].i[0] = (rt1);  fp.fp_par[2].i[1] = (rt2); \
-      fp.fp_par[3].i[0] = (dv1);  fp.fp_par[3].i[1] = (dv2); \
-    } \
-  while (0)
+  #define INIT_FLT_PAR(fp, fmt, sm1, sm2, lrg1, lrg2, rt1, rt2, dv1, dv2) \
+    do \
+      { \
+        fp.fp_fmt = (fmt); \
+        fp.fp_par[0].i[0] = (sm1);  fp.fp_par[0].i[1] = (sm2); \
+        fp.fp_par[1].i[0] = (lrg1); fp.fp_par[1].i[1] = (lrg2); \
+        fp.fp_par[2].i[0] = (rt1);  fp.fp_par[2].i[1] = (rt2); \
+        fp.fp_par[3].i[0] = (dv1);  fp.fp_par[3].i[1] = (dv2); \
+      } \
+    while (0)
 
-static int
-equiv_compare (const equiv *std, const equiv *v, int len)
-{
-  int i;
-  for (i = 0; i < len; i++)
-    if (v[i].i[0] != std[i].i[0] || v[i].i[1] != std[i].i[1])
-      return 0;
-  return 1;
-}
+  static int
+  equiv_compare (const equiv *std, const equiv *v, int len)
+  {
+    int i;
+    for (i = 0; i < len; i++)
+      if (v[i].i[0] != std[i].i[0] || v[i].i[1] != std[i].i[1])
+        return 0;
+    return 1;
+  }
 
-static oct_mach_info::float_format
-get_float_format (void)
-{
-  oct_mach_info::float_format retval = oct_mach_info::flt_fmt_unknown;
-
-  float_params fp[5];
+  static mach_info::float_format
+  get_float_format (void)
+  {
+    mach_info::float_format retval = mach_info::flt_fmt_unknown;
 
-  INIT_FLT_PAR (fp[0], oct_mach_info::flt_fmt_ieee_big_endian,
-                   1048576,  0,
-                2146435071, -1,
-                1017118720,  0,
-                1018167296,  0);
+    float_params fp[5];
+
+    INIT_FLT_PAR (fp[0], mach_info::flt_fmt_ieee_big_endian,
+                     1048576,  0,
+                  2146435071, -1,
+                  1017118720,  0,
+                  1018167296,  0);
 
-  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[1], mach_info::flt_fmt_ieee_little_endian,
+                   0,    1048576,
+                  -1, 2146435071,
+                   0, 1017118720,
+                   0, 1018167296);
 
-  INIT_FLT_PAR (fp[4], oct_mach_info::flt_fmt_unknown,
-                0, 0,
-                0, 0,
-                0, 0,
-                0, 0);
+    INIT_FLT_PAR (fp[4], mach_info::flt_fmt_unknown,
+                  0, 0,
+                  0, 0,
+                  0, 0,
+                  0, 0);
 
-  equiv mach_fp_par[4];
+    equiv mach_fp_par[4];
 
-  mach_fp_par[0].d = F77_FUNC (d1mach, D1MACH) (1);
-  mach_fp_par[1].d = F77_FUNC (d1mach, D1MACH) (2);
-  mach_fp_par[2].d = F77_FUNC (d1mach, D1MACH) (3);
-  mach_fp_par[3].d = F77_FUNC (d1mach, D1MACH) (4);
+    mach_fp_par[0].d = F77_FUNC (d1mach, D1MACH) (1);
+    mach_fp_par[1].d = F77_FUNC (d1mach, D1MACH) (2);
+    mach_fp_par[2].d = F77_FUNC (d1mach, D1MACH) (3);
+    mach_fp_par[3].d = F77_FUNC (d1mach, D1MACH) (4);
 
-  int i = 0;
-  do
-    {
-      if (equiv_compare (fp[i].fp_par, mach_fp_par, 4))
-        {
-          retval = fp[i].fp_fmt;
-          break;
-        }
-    }
-  while (fp[++i].fp_fmt != oct_mach_info::flt_fmt_unknown);
+    int i = 0;
+    do
+      {
+        if (equiv_compare (fp[i].fp_par, mach_fp_par, 4))
+          {
+            retval = fp[i].fp_fmt;
+            break;
+          }
+      }
+    while (fp[++i].fp_fmt != mach_info::flt_fmt_unknown);
 
-  return retval;
-}
+    return retval;
+  }
 
-static bool
-ten_little_endians (void)
-{
-  // Are we little or big endian?  From Harbison & Steele.
-
-  union
+  static bool
+  ten_little_endians (void)
   {
-    long l;
-    char c[sizeof (long)];
-  } u;
+    // Are we little or big endian?  From Harbison & Steele.
 
-  u.l = 1;
+    union
+    {
+      long l;
+      char c[sizeof (long)];
+    } u;
 
-  return (u.c[sizeof (long) - 1] == 1);
-}
+    u.l = 1;
 
-oct_mach_info::oct_mach_info (void)
-  : native_float_fmt (get_float_format ()),
-    big_chief (ten_little_endians ()) { }
+    return (u.c[sizeof (long) - 1] == 1);
+  }
 
-bool
-oct_mach_info::instance_ok (void)
-{
-  bool retval = true;
+  mach_info::mach_info (void)
+    : native_float_fmt (get_float_format ()),
+      big_chief (ten_little_endians ()) { }
 
-  if (! instance)
-    {
-      instance = new oct_mach_info ();
+  bool
+  mach_info::instance_ok (void)
+  {
+    bool retval = true;
 
-      if (instance)
-        singleton_cleanup_list::add (cleanup_instance);
-    }
+    if (! instance)
+      {
+        instance = new mach_info ();
 
-  if (! instance)
-    (*current_liboctave_error_handler)
-      ("unable to create command history object!");
-
-  return retval;
-}
+        if (instance)
+          singleton_cleanup_list::add (cleanup_instance);
+      }
 
-oct_mach_info::float_format
-oct_mach_info::native_float_format (void)
-{
-  return (instance_ok ())
-         ? instance->native_float_fmt : oct_mach_info::flt_fmt_unknown;
-}
+    if (! instance)
+      (*current_liboctave_error_handler)
+        ("unable to create command history object!");
+
+    return retval;
+  }
 
-bool
-oct_mach_info::words_big_endian (void)
-{
-  return (instance_ok ())
-         ? instance->big_chief : false;
-}
+  mach_info::float_format
+  mach_info::native_float_format (void)
+  {
+    return (instance_ok ())
+           ? instance->native_float_fmt : mach_info::flt_fmt_unknown;
+  }
 
-bool
-oct_mach_info::words_little_endian (void)
-{
-  return (instance_ok ())
-         ? (! instance->big_chief) : false;
-}
+  bool
+  mach_info::words_big_endian (void)
+  {
+    return (instance_ok ())
+           ? instance->big_chief : false;
+  }
 
-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::flt_fmt_unknown;
+  bool
+  mach_info::words_little_endian (void)
+  {
+    return (instance_ok ())
+           ? (! instance->big_chief) : false;
+  }
 
-  if (s == "native" || s == "n")
-    retval = oct_mach_info::native_float_format ();
-  else if (s == "ieee-be" || s == "b")
-    retval = oct_mach_info::flt_fmt_ieee_big_endian;
-  else if (s == "ieee-le" || s == "l")
-    retval = oct_mach_info::flt_fmt_ieee_little_endian;
-  else if (s == "unknown")
-    retval = oct_mach_info::flt_fmt_unknown;
-  else
-    (*current_liboctave_error_handler) ("invalid architecture type specified");
+  mach_info::float_format
+  mach_info::string_to_float_format (const std::string& s)
+  {
+    mach_info::float_format retval = mach_info::flt_fmt_unknown;
 
-  return retval;
-}
+    if (s == "native" || s == "n")
+      retval = mach_info::native_float_format ();
+    else if (s == "ieee-be" || s == "b")
+      retval = mach_info::flt_fmt_ieee_big_endian;
+    else if (s == "ieee-le" || s == "l")
+      retval = mach_info::flt_fmt_ieee_little_endian;
+    else if (s == "unknown")
+      retval = mach_info::flt_fmt_unknown;
+    else
+      (*current_liboctave_error_handler) ("invalid architecture type specified");
 
-std::string
-oct_mach_info::float_format_as_string (float_format flt_fmt)
-{
-  std::string retval = "unknown";
+    return retval;
+  }
 
-  switch (flt_fmt)
-    {
-    case flt_fmt_ieee_big_endian:
-      retval = "ieee-be";
-      break;
+  std::string
+  mach_info::float_format_as_string (float_format flt_fmt)
+  {
+    std::string retval = "unknown";
+
+    switch (flt_fmt)
+      {
+      case flt_fmt_ieee_big_endian:
+        retval = "ieee-be";
+        break;
 
-    case flt_fmt_ieee_little_endian:
-      retval = "ieee-le";
-      break;
+      case flt_fmt_ieee_little_endian:
+        retval = "ieee-le";
+        break;
 
-    default:
-      break;
-    }
+      default:
+        break;
+      }
 
-  return retval;
+    return retval;
+  }
 }
diff -r a99c2407f930 -r c4ab2e54f100 liboctave/system/mach-info.h
--- a/liboctave/system/mach-info.h	Thu May 19 01:50:04 2016 -0400
+++ b/liboctave/system/mach-info.h	Thu May 19 01:59:35 2016 -0400
@@ -27,52 +27,62 @@
 
 #include <string>
 
-class
-OCTAVE_API
-oct_mach_info
+namespace octave
 {
-protected:
+  class
+  OCTAVE_API
+  mach_info
+  {
+  protected:
 
-  oct_mach_info (void);
+    mach_info (void);
 
-public:
+  public:
 
-  enum float_format
-  {
-    flt_fmt_unknown,
-    flt_fmt_ieee_little_endian,
-    flt_fmt_ieee_big_endian,
-  };
+    enum float_format
+    {
+      flt_fmt_unknown,
+      flt_fmt_ieee_little_endian,
+      flt_fmt_ieee_big_endian,
+    };
 
-  static bool instance_ok (void);
+    static bool instance_ok (void);
+
+    static float_format native_float_format (void);
 
-  static float_format native_float_format (void);
+    static bool words_big_endian (void);
 
-  static bool words_big_endian (void);
+    static bool words_little_endian (void);
 
-  static bool words_little_endian (void);
+    static float_format string_to_float_format (const std::string&);
 
-  static float_format string_to_float_format (const std::string&);
+    static std::string float_format_as_string (float_format);
 
-  static std::string float_format_as_string (float_format);
+  private:
 
-private:
+    static mach_info *instance;
 
-  static oct_mach_info *instance;
+    static void cleanup_instance (void) { delete instance; instance = 0; }
 
-  static void cleanup_instance (void) { delete instance; instance = 0; }
+    // The floating point format for the current machine.
+    mutable float_format native_float_fmt;
 
-  // The floating point format for the current machine.
-  mutable float_format native_float_fmt;
+    // TRUE if the byte order on this system is big endian.
+    mutable bool big_chief;
 
-  // TRUE if the byte order on this system is big endian.
-  mutable bool big_chief;
+    // No copying!
+
+    mach_info (const mach_info&);
 
-  // No copying!
+    mach_info& operator = (const mach_info&);
+  };
+}
 
-  oct_mach_info (const oct_mach_info&);
+#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS)
 
-  oct_mach_info& operator = (const oct_mach_info&);
-};
+OCTAVE_DEPRECATED ("use octave::mach_info instead")
+typedef octave::mach_info oct_mach_info;
 
 #endif
+
+#endif
diff -r a99c2407f930 -r c4ab2e54f100 liboctave/util/data-conv.cc
--- a/liboctave/util/data-conv.cc	Thu May 19 01:50:04 2016 -0400
+++ b/liboctave/util/data-conv.cc	Thu May 19 01:59:35 2016 -0400
@@ -652,18 +652,18 @@
 
 void
 do_double_format_conversion (void *data, octave_idx_type len,
-                             oct_mach_info::float_format from_fmt,
-                             oct_mach_info::float_format to_fmt)
+                             octave::mach_info::float_format from_fmt,
+                             octave::mach_info::float_format to_fmt)
 {
   switch (to_fmt)
     {
-    case oct_mach_info::flt_fmt_ieee_little_endian:
+    case octave::mach_info::flt_fmt_ieee_little_endian:
       switch (from_fmt)
         {
-        case oct_mach_info::flt_fmt_ieee_little_endian:
+        case octave::mach_info::flt_fmt_ieee_little_endian:
           break;
 
-        case oct_mach_info::flt_fmt_ieee_big_endian:
+        case octave::mach_info::flt_fmt_ieee_big_endian:
           IEEE_big_double_to_IEEE_little_double (data, len);
           break;
 
@@ -673,14 +673,14 @@
         }
       break;
 
-    case oct_mach_info::flt_fmt_ieee_big_endian:
+    case octave::mach_info::flt_fmt_ieee_big_endian:
       switch (from_fmt)
         {
-        case oct_mach_info::flt_fmt_ieee_little_endian:
+        case octave::mach_info::flt_fmt_ieee_little_endian:
           IEEE_little_double_to_IEEE_big_double (data, len);
           break;
 
-        case oct_mach_info::flt_fmt_ieee_big_endian:
+        case octave::mach_info::flt_fmt_ieee_big_endian:
           break;
 
         default:
@@ -699,18 +699,18 @@
 
 void
 do_float_format_conversion (void *data, octave_idx_type len,
-                            oct_mach_info::float_format from_fmt,
-                            oct_mach_info::float_format to_fmt)
+                            octave::mach_info::float_format from_fmt,
+                            octave::mach_info::float_format to_fmt)
 {
   switch (to_fmt)
     {
-    case oct_mach_info::flt_fmt_ieee_little_endian:
+    case octave::mach_info::flt_fmt_ieee_little_endian:
       switch (from_fmt)
         {
-        case oct_mach_info::flt_fmt_ieee_little_endian:
+        case octave::mach_info::flt_fmt_ieee_little_endian:
           break;
 
-        case oct_mach_info::flt_fmt_ieee_big_endian:
+        case octave::mach_info::flt_fmt_ieee_big_endian:
           IEEE_big_float_to_IEEE_little_float (data, len);
           break;
 
@@ -720,14 +720,14 @@
         }
       break;
 
-    case oct_mach_info::flt_fmt_ieee_big_endian:
+    case octave::mach_info::flt_fmt_ieee_big_endian:
       switch (from_fmt)
         {
-        case oct_mach_info::flt_fmt_ieee_little_endian:
+        case octave::mach_info::flt_fmt_ieee_little_endian:
           IEEE_little_float_to_IEEE_big_float (data, len);
           break;
 
-        case oct_mach_info::flt_fmt_ieee_big_endian:
+        case octave::mach_info::flt_fmt_ieee_big_endian:
           break;
 
         default:
@@ -746,8 +746,8 @@
 
 void
 do_float_format_conversion (void *data, size_t sz, octave_idx_type len,
-                            oct_mach_info::float_format from_fmt,
-                            oct_mach_info::float_format to_fmt)
+                            octave::mach_info::float_format from_fmt,
+                            octave::mach_info::float_format to_fmt)
 {
   switch (sz)
     {
@@ -770,7 +770,7 @@
 void
 read_doubles (std::istream& is, double *data, save_type type,
               octave_idx_type len, bool swap,
-              oct_mach_info::float_format fmt)
+              octave::mach_info::float_format fmt)
 {
   switch (type)
     {
@@ -829,7 +829,7 @@
 void
 read_floats (std::istream& is, float *data, save_type type,
              octave_idx_type len, bool swap,
-             oct_mach_info::float_format fmt)
+             octave::mach_info::float_format fmt)
 {
   switch (type)
     {
diff -r a99c2407f930 -r c4ab2e54f100 liboctave/util/data-conv.h
--- a/liboctave/util/data-conv.h	Thu May 19 01:50:04 2016 -0400
+++ b/liboctave/util/data-conv.h	Thu May 19 01:59:35 2016 -0400
@@ -98,25 +98,25 @@
 
 extern OCTAVE_API void
 do_double_format_conversion (void *data, octave_idx_type len,
-                             oct_mach_info::float_format from_fmt,
-                             oct_mach_info::float_format to_fmt
-                             = oct_mach_info::native_float_format ());
+                             octave::mach_info::float_format from_fmt,
+                             octave::mach_info::float_format to_fmt
+                             = octave::mach_info::native_float_format ());
 
 extern OCTAVE_API void
 do_float_format_conversion (void *data, octave_idx_type len,
-                            oct_mach_info::float_format from_fmt,
-                            oct_mach_info::float_format to_fmt
-                            = oct_mach_info::native_float_format ());
+                            octave::mach_info::float_format from_fmt,
+                            octave::mach_info::float_format to_fmt
+                            = octave::mach_info::native_float_format ());
 
 extern OCTAVE_API void
 do_float_format_conversion (void *data, size_t sz, octave_idx_type len,
-                            oct_mach_info::float_format from_fmt,
-                            oct_mach_info::float_format to_fmt
-                            = oct_mach_info::native_float_format ());
+                            octave::mach_info::float_format from_fmt,
+                            octave::mach_info::float_format to_fmt
+                            = octave::mach_info::native_float_format ());
 
 extern OCTAVE_API void
 read_doubles (std::istream& is, double *data, save_type type,
-              octave_idx_type len, bool swap, oct_mach_info::float_format fmt);
+              octave_idx_type len, bool swap, octave::mach_info::float_format fmt);
 
 extern OCTAVE_API void
 write_doubles (std::ostream& os, const double *data, save_type type,
@@ -124,7 +124,7 @@
 
 extern OCTAVE_API void
 read_floats (std::istream& is, float *data, save_type type,
-             octave_idx_type len, bool swap, oct_mach_info::float_format fmt);
+             octave_idx_type len, bool swap, octave::mach_info::float_format fmt);
 
 extern OCTAVE_API void
 write_floats (std::ostream& os, const float *data, save_type type,
diff -r a99c2407f930 -r c4ab2e54f100 liboctave/util/lo-ieee.cc
--- a/liboctave/util/lo-ieee.cc	Thu May 19 01:50:04 2016 -0400
+++ b/liboctave/util/lo-ieee.cc	Thu May 19 01:59:35 2016 -0400
@@ -224,12 +224,12 @@
 
   if (! initialized)
     {
-      oct_mach_info::float_format ff = oct_mach_info::native_float_format ();
+      octave::mach_info::float_format ff = octave::mach_info::native_float_format ();
 
       switch (ff)
         {
-        case oct_mach_info::flt_fmt_ieee_big_endian:
-        case oct_mach_info::flt_fmt_ieee_little_endian:
+        case octave::mach_info::flt_fmt_ieee_big_endian:
+        case octave::mach_info::flt_fmt_ieee_little_endian:
           {
             lo_nan = std::numeric_limits<double>::quiet_NaN ();
             lo_inf = std::numeric_limits<double>::infinity ();
@@ -239,7 +239,7 @@
 
             // The following is patterned after code in R.
 
-            if (ff == oct_mach_info::flt_fmt_ieee_big_endian)
+            if (ff == octave::mach_info::flt_fmt_ieee_big_endian)
               {
                 lo_ieee_hw = 0;
                 lo_ieee_lw = 1;