Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Remove use of scoped_restore_tmpl from scoped_restore_warning_hook

Browse Source 
The warning_hook_handler function pointer takes va_list as
an argument, which on some platforms (mingw64) includes some
attributes. Attributes get ignored in template arguments.
This led to the compiler warning:

error: ignoring attributes on template argument 'warning_hook_handler' {aka 'void (*)(const char*, char*)'} [-Werror=ignored-attributes]
  387 |   scoped_restore_tmpl<warning_hook_handler> m_save;
      |                                           ^

By manually implementing the save/restore behaviour, rather
than using the helper template, this warning is fixed.

Approved-By: Tom Tromey <tom@tromey.com>
This commit is contained in:
Ciaran Woodward
2024-02-06 17:56:07 +00:00
parent c33ea119b1
commit 6fb99666f4
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/utils.c
View File

@@ -145,8 +145,14 @@ get_warning_hook_handler ()
scoped_restore_warning_hook::scoped_restore_warning_hook
(warning_hook_handler new_handler)
: m_save (make_scoped_restore (&warning_hook, new_handler))
: m_save (warning_hook)
{
warning_hook = new_handler;
}
scoped_restore_warning_hook::~scoped_restore_warning_hook ()
{
warning_hook = m_save;
}
/* Print a warning message. The first argument STRING is the warning

9
gdb/utils.h
View File

@@ -383,8 +383,15 @@ class scoped_restore_warning_hook
public:
explicit scoped_restore_warning_hook (warning_hook_handler new_handler);
~scoped_restore_warning_hook ();
private:
scoped_restore_tmpl<warning_hook_handler> m_save;
scoped_restore_warning_hook (const scoped_restore_warning_hook &other)
= delete;
scoped_restore_warning_hook &operator= (const scoped_restore_warning_hook &)
= delete;
warning_hook_handler m_save;
};
/* Return the current warning handler. */