--- a/main/fixed/src/ov-fixed-cx-mat.cc	Wed Feb 22 21:56:05 2012 +0000
+++ b/main/fixed/src/ov-fixed-cx-mat.cc	Wed Feb 22 22:07:33 2012 +0000
@@ -113,7 +113,7 @@
       return octave_value ();
     }
   FixedComplexMatrix retval (matrix); 
-  retval.resize (dv(0), dv(1)); 
+  retval.resize (dv); 
   return new octave_fixed_complex_matrix (retval);
 }
 
@@ -296,8 +296,8 @@
     {
       FixedPointComplex c = matrix (0, 0);
 
-      if (::imag (c) == 0.0)
-	retval = new octave_fixed (::real (c));
+      if (imag (c) == 0)
+	retval = new octave_fixed (real (c));
       else
 	retval = new octave_fixed_complex (c);
     }
@@ -403,9 +403,9 @@
 }
 
 static void
-restore_precision (void *p)
+restore_precision (int *p)
 {
-  bind_internal_variable ("output_precision", *(static_cast<int *> (p)));
+  bind_internal_variable ("output_precision", *p);
 }
 
 void
@@ -420,13 +420,15 @@
 
   octave_value_list tmp = feval ("output_precision");
   int prec = tmp(0).int_value ();
-  unwind_protect::add (restore_precision, &prec);
+
+  unwind_protect frame;
+
+  frame.add_fcn (restore_precision, &prec);
+
   bind_internal_variable ("output_precision", new_prec);
 
   octave_print_internal (os, complex_matrix_value(), false, 
 			 current_print_indent_level ());
-
-  unwind_protect::run ();
 }
 
 bool 
@@ -594,7 +596,7 @@
     return false;
   
   // This is ugly, is there a better way?
-  matrix.resize (dv(0), dv(1));
+  matrix.resize (dim_vector (dv(0), dv(1)));
   for (int i = 0; i < dv(0); i++)
     for (int j = 0; j < dv(1); j++)
       matrix (i, j) = 
@@ -936,7 +938,7 @@
     return false;
 
   // This is ugly, is there a better way?
-  matrix.resize (dv(0), dv(1));
+  matrix.resize (dim_vector (dv(0), dv(1)));
   unsigned int * ivec = intsize;
   unsigned int * dvec = decsize;
   unsigned int * nvec = number;