# HG changeset patch # User John W. Eaton # Date 1349130751 14400 # Node ID 72868cae7624b4ae15adac736131038b51b7e44e # Parent 6437fa7263dd59d4bdb413f1540003eaad30bd7f eliminate some deprecated function warnings * input.cc, load-path.cc, ov-oncleanup.cc, oct-parse.yy, pt-eval.cc: Eliminate calls to unwind_protect::run_top and unwind_protect::discard_top. diff -r 6437fa7263dd -r 72868cae7624 libinterp/interpfcn/input.cc --- a/libinterp/interpfcn/input.cc Mon Oct 01 18:32:12 2012 -0400 +++ b/libinterp/interpfcn/input.cc Mon Oct 01 18:32:31 2012 -0400 @@ -765,7 +765,7 @@ // Unmark forced variables. // Restore previous value of global_command. - frame.run_top (2); + frame.run (2); octave_quit (); } diff -r 6437fa7263dd -r 72868cae7624 libinterp/interpfcn/load-path.cc --- a/libinterp/interpfcn/load-path.cc Mon Oct 01 18:32:12 2012 -0400 +++ b/libinterp/interpfcn/load-path.cc Mon Oct 01 18:32:31 2012 -0400 @@ -603,7 +603,7 @@ do_append (*i, warn); // Restore add hook and execute for all newly added directories. - frame.run_top (); + frame.run_first (); for (dir_info_list_iterator i = dir_info_list.begin (); i != dir_info_list.end (); diff -r 6437fa7263dd -r 72868cae7624 libinterp/octave-value/ov-oncleanup.cc --- a/libinterp/octave-value/ov-oncleanup.cc Mon Oct 01 18:32:12 2012 -0400 +++ b/libinterp/octave-value/ov-oncleanup.cc Mon Oct 01 18:32:31 2012 -0400 @@ -103,7 +103,7 @@ // Otherwise, set it back to what it was before. if (error_state) { - frame.discard_top (); + frame.discard_first (); octave_call_stack::backtrace_error_message (); } } diff -r 6437fa7263dd -r 72868cae7624 libinterp/parse-tree/oct-parse.yy --- a/libinterp/parse-tree/oct-parse.yy Mon Oct 01 18:32:12 2012 -0400 +++ b/libinterp/parse-tree/oct-parse.yy Mon Oct 01 18:32:31 2012 -0400 @@ -4373,7 +4373,7 @@ // Unmark forced variables. // Restore previous value of global_command. - frame.run_top (2); + frame.run (2); if (parse_status == 0) { diff -r 6437fa7263dd -r 72868cae7624 libinterp/parse-tree/pt-eval.cc --- a/libinterp/parse-tree/pt-eval.cc Mon Oct 01 18:32:12 2012 -0400 +++ b/libinterp/parse-tree/pt-eval.cc Mon Oct 01 18:32:31 2012 -0400 @@ -990,11 +990,11 @@ if (tree_break_command::breaking || tree_return_command::returning) { - frame.discard_top (2); + frame.discard (2); } else { - frame.run_top (2); + frame.run (2); } // We don't want to ignore errors that occur in the cleanup code, so @@ -1002,9 +1002,9 @@ // Otherwise, set it back to what it was before. if (error_state) - frame.discard_top (2); + frame.discard (2); else - frame.run_top (2); + frame.run (2); frame.run (); }