# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1571428678 14400
# Node ID 2af853f94b97f99c524eaba77297266140a1eb1e
# Parent  4781506913363f97925f9ba9a69061b0ebebb6ef
use unwind_protect_var instead of unwind_protect object for a single var

* interpreter.cc (interpreter::initialize_load_path):
Use unwind_protect_var object instead of unwind_protect.

diff -r 478150691336 -r 2af853f94b97 libinterp/corefcn/interpreter.cc
--- a/libinterp/corefcn/interpreter.cc	Fri Oct 18 15:40:25 2019 -0400
+++ b/libinterp/corefcn/interpreter.cc	Fri Oct 18 15:57:58 2019 -0400
@@ -890,11 +890,7 @@
 
     std::string code_to_eval = options.code_to_eval ();
 
-    unwind_protect frame;
-
-    frame.add_method (this, &interpreter::interactive, m_interactive);
-
-    m_interactive = false;
+    unwind_protect_var<bool> upv (m_interactive, false);
 
     int parse_status = 0;