Mercurial > hg > octave-lyh

diff src/pt-arg-list.cc @ 9377:610bf90fce2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update unwind_protect usage everywhere
author Jaroslav Hajek <highegg@gmail.com>
date Tue, 23 Jun 2009 08:22:13 +0200
parents eb63fbe60fab
children 9ecd35a606e3
line wrap: on
line diff
--- a/src/pt-arg-list.cc
+++ b/src/pt-arg-list.cc
@@ -162,12 +162,14 @@
 		       && object
 		       && ! (object->is_function ()
 			     || object->is_function_handle ()));
+  
+  unwind_protect::frame_id_t uwp_frame;
 
   if (stash_object)
     {
-      unwind_protect::begin_frame ("convert_to_const_vector");
+      uwp_frame = unwind_protect::begin_frame ();
 
-      unwind_protect_const_ptr (indexed_object);
+      unwind_protect::protect_var (indexed_object);
 
       indexed_object = object;
     }
@@ -181,8 +183,8 @@
     {
       if (stash_object)
 	{
-	  unwind_protect_int (index_position);
-	  unwind_protect_int (num_indices);
+	  unwind_protect::protect_var (index_position);
+	  unwind_protect::protect_var (num_indices);
 
 	  index_position = k;
 	  num_indices = len;
@@ -216,7 +218,7 @@
     }
 
   if (stash_object)
-    unwind_protect::run_frame ("convert_to_const_vector");
+    unwind_protect::run_frame (uwp_frame);
 
   return args;
 }