Change type of scoped_input_handler::m_quit_handler

Simon pointed out that scoped_input_handler::m_quit_handler must have
the correct scoped_restore_tmpl type, to avoid binding to a temporary.
This patch fixes the problem.

gdb/ChangeLog
2017-09-22  Tom Tromey  <tom@tromey.com>

	* utils.c (class scoped_input_handler) <m_quit_handler>: Change
	type to scoped_restore_tmpl.
	<scoped_input_handler>: Initialize m_quit_handler directly.

Reviewed-By: Pedro Alves <palves@redhat.com>

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 54eadaef98f707049f0a3fdcfc4780cbd8e78fe9..aa50dc9f5bb02d6a94ad087f3b7354c8c8eef247 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-22  Tom Tromey  <tom@tromey.com>
+
+       * utils.c (class scoped_input_handler) <m_quit_handler>: Change
+       type to scoped_restore_tmpl.
+       <scoped_input_handler>: Initialize m_quit_handler directly.
+
 2017-09-22  Sergio Durigan Junior  <sergiodj@redhat.com>
 
        * cli/cli-cmds.c (pwd_command): Use "getcwd (NULL, 0)".

diff --git a/gdb/utils.c b/gdb/utils.c
index 9fea0f77b803f9bf0ed8412f3f30773442168f63..41ad35f14705ba8e64ce9b818ab82ef110cd7e6f 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -904,8 +904,7 @@ class scoped_input_handler
 public:
 
   scoped_input_handler ()
-    : m_quit_handler (make_scoped_restore (&quit_handler,
-                                          default_quit_handler)),
+    : m_quit_handler (&quit_handler, default_quit_handler),
       m_ui (NULL)
   {
     target_terminal::ours ();
@@ -928,7 +927,7 @@ private:
   target_terminal::scoped_restore_terminal_state m_term_state;
 
   /* Save and restore the quit handler.  */
-  scoped_restore m_quit_handler;
+  scoped_restore_tmpl<quit_handler_ftype *> m_quit_handler;
 
   /* The saved UI, if non-NULL.  */
   struct ui *m_ui;