Mercurial > octave-nkf

diff src/load-path.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 2ed8d2d92507
children 6c421f2355b5
line wrap: on
line diff
--- a/src/load-path.cc	Tue Jun 23 07:55:44 2009 +0200
+++ b/src/load-path.cc	Tue Jun 23 08:22:13 2009 +0200
@@ -557,7 +557,7 @@
 
   // Temporarily disable add hook.
 
-  unwind_protect_fptr (add_hook);
+  unwind_protect::protect_var (add_hook);
 
   add_hook = 0;
 
@@ -1781,9 +1781,9 @@
   if (! octave_interpreter_ready)
     return;
 
-  unwind_protect::begin_frame ("execute_pkg_add_or_del");
+  unwind_protect::frame_id_t uwp_frame = unwind_protect::begin_frame ();
 
-  unwind_protect_bool (input_from_startup_file);
+  unwind_protect::protect_var (input_from_startup_file);
 
   input_from_startup_file = true;
 
@@ -1794,7 +1794,7 @@
   if (fs.exists ())
     source_file (file, "base");
 
-  unwind_protect::run_frame ("execute_pkg_add_or_del");
+  unwind_protect::run_frame (uwp_frame);
 }
 
 void