--- a/src/ov-base-int.cc	Thu Apr 13 13:04:33 2006 +0000
+++ b/src/ov-base-int.cc	Fri Apr 14 04:01:40 2006 +0000
@@ -135,14 +135,14 @@
 
   // Use negative value for ndims to differentiate with old format!!
   FOUR_BYTE_INT tmp = - d.length();
-  os.write (X_CAST (char *, &tmp), 4);
+  os.write (reinterpret_cast<char *> (&tmp), 4);
   for (int i=0; i < d.length (); i++)
     {
       tmp = d(i);
-      os.write (X_CAST (char *, &tmp), 4);
+      os.write (reinterpret_cast<char *> (&tmp), 4);
     }
 
-  os.write (X_CAST(char *, this->matrix.data()), this->byte_size());
+  os.write (reinterpret_cast<const char *> (this->matrix.data()), this->byte_size());
 
   return true;
 }
@@ -153,7 +153,7 @@
 					oct_mach_info::float_format )
 {
   FOUR_BYTE_INT mdims;
-  if (! is.read (X_CAST (char *, &mdims), 4))
+  if (! is.read (reinterpret_cast<char *> (&mdims), 4))
     return false;
   if (swap)
     swap_bytes<4> (&mdims);
@@ -167,7 +167,7 @@
 
   for (int i = 0; i < mdims; i++)
     {
-      if (! is.read (X_CAST (char *, &di), 4))
+      if (! is.read (reinterpret_cast<char *> (&di), 4))
 	return false;
       if (swap)
 	swap_bytes<4> (&di);
@@ -188,7 +188,7 @@
 
   T m (dv);
 
-  if (! is.read (X_CAST (char *, m.data ()), m.byte_size ()))
+  if (! is.read (reinterpret_cast<char *> (m.fortran_vec ()), m.byte_size ()))
     return false;
 
   if (swap)
@@ -354,7 +354,7 @@
 bool 
 octave_base_int_scalar<T>::save_binary (std::ostream& os, bool&)
 {
-  os.write (X_CAST(char *, &(this->scalar)), this->byte_size());
+  os.write (reinterpret_cast<char *> (&(this->scalar)), this->byte_size());
   return true;
 }
 
@@ -364,7 +364,7 @@
 					oct_mach_info::float_format)
 {
   T tmp;
-  if (! is.read (X_CAST (char *, &tmp), this->byte_size()))
+  if (! is.read (reinterpret_cast<char *> (&tmp), this->byte_size()))
     return false;
 
   if (swap)