Mercurial > hg > octave-nkf

diff src/ov-fcn-handle.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 70e0d3b1f26f
children 1de00ca9c9f2
line wrap: on
line diff
--- a/src/ov-fcn-handle.cc
+++ b/src/ov-fcn-handle.cc
@@ -313,7 +313,7 @@
 
       pos = is.tellg ();
 
-      unwind_protect::begin_frame ("anon_ascii_load");
+      unwind_protect::frame_id_t uwp_frame = unwind_protect::begin_frame ();
 
       // Set up temporary scope to use for evaluating the text that
       // defines the anonymous function.
@@ -385,7 +385,7 @@
       else
 	success = false;
 
-      unwind_protect::run_frame ("anon_ascii_load");
+      unwind_protect::run_frame (uwp_frame);
     }
   else
     success = set_fcn (octaveroot, fpath);
@@ -494,7 +494,7 @@
       OCTAVE_LOCAL_BUFFER (char, ctmp2, tmp+1);
       is.get (ctmp2, tmp+1, 0);
 
-      unwind_protect::begin_frame ("anon_binary_load");
+      unwind_protect::frame_id_t uwp_frame = unwind_protect::begin_frame ();
 
       // Set up temporary scope to use for evaluating the text that
       // defines the anonymous function.
@@ -555,7 +555,7 @@
 	    success = false;
 	}
 
-      unwind_protect::run_frame ("anon_binary_load");
+      unwind_protect::run_frame (uwp_frame);
     }
   else
     {
@@ -939,7 +939,7 @@
       // restore error reporting:
       H5Eset_auto (err_func, err_func_data);
 
-      unwind_protect::begin_frame ("anon_hdf5_load");
+      unwind_protect::frame_id_t uwp_frame = unwind_protect::begin_frame ();
 
       // Set up temporary scope to use for evaluating the text that
       // defines the anonymous function.
@@ -1015,7 +1015,7 @@
 	    success = false;
 	}
 
-      unwind_protect::run_frame ("anon_hdf5_load");
+      unwind_protect::run_frame (uwp_frame);
     }
   else
     {