--- a/main/fixed/src/ov-fixed-mat.cc	Wed Feb 22 21:56:05 2012 +0000
+++ b/main/fixed/src/ov-fixed-mat.cc	Wed Feb 22 22:07:33 2012 +0000
@@ -354,7 +354,7 @@
 	}
       else
 	{
-	  charMatrix chm (nr, nc);
+	  charMatrix chm (dim_vector (nr, nc));
 	  
 	  bool warned = false;
 
@@ -386,7 +386,7 @@
 		}
 	    }
 
-	  retval = octave_value (chm, 1);
+	  retval = octave_value (chm);
 	}
     }
 
@@ -394,9 +394,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
@@ -409,13 +409,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, matrix_value(), false, 
 			 current_print_indent_level ());
-
-  unwind_protect::run ();
 }
 
 bool