diff src/ov-base-int.cc @ 4944:44046bbaa52c

[project @ 2004-08-31 05:30:46 by jwe]
author jwe
date Tue, 31 Aug 2004 05:30:47 +0000
parents 43f4ebd2704c
children e35b034d3523
line wrap: on
line diff
--- a/src/ov-base-int.cc
+++ b/src/ov-base-int.cc
@@ -42,6 +42,7 @@
 #include "gripes.h"
 #include "oct-obj.h"
 #include "oct-lvalue.h"
+#include "oct-stream.h"
 #include "ops.h"
 #include "ov-base.h"
 #include "ov-base-mat.h"
@@ -158,7 +159,7 @@
   if (! is.read (X_CAST (char *, &mdims), 4))
     return false;
   if (swap)
-    swap_4_bytes (X_CAST (char *, &mdims));
+    swap_bytes<4> (&mdims);
   if (mdims >= 0)
     return false;
 
@@ -172,7 +173,7 @@
       if (! is.read (X_CAST (char *, &di), 4))
 	return false;
       if (swap)
-	swap_4_bytes (X_CAST (char *, &di));
+	swap_bytes<4> (&di);
       dv(i) = di;
     }
 
@@ -189,13 +190,13 @@
 	switch (bytes)
 	  {
 	  case 8:
-	    swap_8_bytes (X_CAST (char *, &m(i)));
+	    swap_bytes<8> (&m(i));
 	    break;
 	  case 4:
-	    swap_4_bytes (X_CAST (char *, &m(i)));
+	    swap_bytes<4> (&m(i));
 	    break;
 	  case 2:
-	    swap_2_bytes (X_CAST (char *, &m(i)));
+	    swap_bytes<2> (&m(i));
 	    break;
 	  case 1:
 	  default:
@@ -361,13 +362,13 @@
     switch (this->byte_size())
       {
       case 8:
-	swap_8_bytes (X_CAST (char *, &tmp));
+	swap_bytes<8> (&tmp);
 	break;
       case 4:
-	swap_4_bytes (X_CAST (char *, &tmp));
+	swap_bytes<4> (&tmp);
 	break;
       case 2:
-	swap_2_bytes (X_CAST (char *, &tmp));
+	swap_bytes<2> (&tmp);
 	break;
       case 1:
       default:
@@ -378,6 +379,7 @@
 }
 
 #if defined (HAVE_HDF5)
+
 template <class T>
 bool
 octave_base_int_scalar<T>::save_hdf5 (hid_t loc_id, const char *name, bool)
@@ -438,6 +440,7 @@
 
   return true;
 }
+
 #endif
 
 /*