From cc1cc4061bcfb71d99b4e000c0dd0fdd9907a043 Mon Sep 17 00:00:00 2001 From: Lancelot Six Date: Fri, 13 Oct 2023 13:00:08 +0000 Subject: [PATCH] gdb: Use initializers in lambda captures unconditionally Initializers in lambda captures were introduced in C++14, and conditionally used in gdb/cp-support.c and gdb/dwarf2/cooked-index.c. Since C++17 is now required by GDB, use this feature unconditionally. Change-Id: I87a3d567941e5c71217538fa75c952e4d421fa1d Approved-By: Tom Tromey Approved-By: Pedro Alves --- gdb/cp-support.c | 8 +------- gdb/dwarf2/cooked-index.c | 7 +------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/gdb/cp-support.c b/gdb/cp-support.c index 834c4774755..cb169444d2a 100644 --- a/gdb/cp-support.c +++ b/gdb/cp-support.c @@ -1657,13 +1657,7 @@ gdb_demangle (const char *name, int options) we might be in a background thread. Instead, arrange for the reporting to happen on the main thread. */ std::string copy = name; - run_on_main_thread ([ -#if __cplusplus >= 201402L - =, copy = std::move (copy) -#else - = -#endif - ] () + run_on_main_thread ([=, copy = std::move (copy)] () { report_failed_demangle (copy.c_str (), core_dump_allowed, crash_signal); diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c index 7c4af3a1681..10631dccecf 100644 --- a/gdb/dwarf2/cooked-index.c +++ b/gdb/dwarf2/cooked-index.c @@ -466,12 +466,7 @@ cooked_index::start_writing_index (dwarf2_per_bfd *per_bfd) started, because it may call 'wait'. */ m_write_future = gdb::thread_pool::g_thread_pool->post_task ([this, per_bfd, -#if __cplusplus >= 201402L - ctx = std::move (ctx) -#else - ctx -#endif - ] () + ctx = std::move (ctx)] () { maybe_write_index (per_bfd, ctx); });