From b1f0c0b90bc8e93eb2d8592c675cba018ac50739 Mon Sep 17 00:00:00 2001 From: Wataru Ashihara Date: Sun, 8 Dec 2019 17:00:43 +0900 Subject: [PATCH] gdb/darwin-nat.c: Fix template argument for scoped_restore_tmpl This should be the type of startup_with_shell, whose type was changed from int to bool at commit 80fd28264. This fixes the build on macOS: CXX darwin-nat.o In file included from ../../gdb/darwin-nat.c:22: In file included from ../../gdb/top.h:25: In file included from ../../gdb/value.h:23: In file included from ../../gdb/frame.h:72: In file included from ../../gdb/language.h:26: In file included from ../../gdb/symtab.h:33: ../../gdb/gdbsupport/gdb_optional.h:155:19: error: no matching constructor for initialization of 'scoped_restore_tmpl' new (&m_item) T (std::forward(args)...); ^ ~~~~~~~~~~~~~~~~~~~~~~~~ ../../gdb/darwin-nat.c:1995:31: note: in instantiation of function template specialization 'gdb::optional >::emplace' requested here restore_startup_with_shell.emplace (&startup_with_shell, 0); ^ ../../gdb/gdbsupport/scoped_restore.h:69:3: note: candidate constructor template not viable: no known conversion from 'bool *' to 'int *' for 1st argument scoped_restore_tmpl (T *var, T2 value) ^ ../../gdb/gdbsupport/scoped_restore.h:57:3: note: candidate constructor not viable: requires single argument 'var', but 2 arguments were provided scoped_restore_tmpl (T *var) ^ ../../gdb/gdbsupport/scoped_restore.h:76:3: note: candidate constructor not viable: requires single argument 'other', but 2 arguments were provided scoped_restore_tmpl (const scoped_restore_tmpl &other) ^ 1 error generated. gdb/ChangeLog 2019-12-08 Wataru Ashihara * darwin-nat.c (darwin_nat_target::create_inferior): Fix template argument for scoped_restore_tmpl from bool to int. Change-Id: Ia0202efd34dbce69b6af5d035fa55ed89215138a --- gdb/ChangeLog | 5 +++++ gdb/darwin-nat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ee45156e391..9709d0de335 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-12-08 Wataru Ashihara + + * darwin-nat.c (darwin_nat_target::create_inferior): Fix + template argument for scoped_restore_tmpl from bool to int. + 2019-12-07 Keith Seitz * build-id.c (build_id_bfd_get): Permit bfd_core, too. diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c index 123d2c0b698..ecc7fc07f69 100644 --- a/gdb/darwin-nat.c +++ b/gdb/darwin-nat.c @@ -1985,7 +1985,7 @@ darwin_nat_target::create_inferior (const char *exec_file, const std::string &allargs, char **env, int from_tty) { - gdb::optional> restore_startup_with_shell; + gdb::optional> restore_startup_with_shell; if (startup_with_shell && may_have_sip ()) { -- 2.30.2