From 6b09f1342cf2d8e2b13a0d634acc3bcf2852a73b Mon Sep 17 00:00:00 2001 From: Lancelot Six Date: Fri, 13 Oct 2023 09:27:48 +0000 Subject: gdb: Replace gdb::optional with std::optional Since GDB now requires C++17, we don't need the internally maintained gdb::optional implementation. This patch does the following replacing: - gdb::optional -> std::optional - gdb::in_place -> std::in_place - #include "gdbsupport/gdb_optional.h" -> #include This change has mostly been done automatically. One exception is gdbsupport/thread-pool.* which did not use the gdb:: prefix as it already lives in the gdb namespace. Change-Id: I19a92fa03e89637bab136c72e34fd351524f65e9 Approved-By: Tom Tromey Approved-By: Pedro Alves --- gdb/skip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gdb/skip.c') diff --git a/gdb/skip.c b/gdb/skip.c index 28902a6..465978f 100644 --- a/gdb/skip.c +++ b/gdb/skip.c @@ -34,7 +34,7 @@ #include "filenames.h" #include "fnmatch.h" #include "gdbsupport/gdb_regex.h" -#include "gdbsupport/gdb_optional.h" +#include #include #include "cli/cli-style.h" #include "gdbsupport/buildargv.h" @@ -113,7 +113,7 @@ private: /* data */ std::string m_function; /* If this is a function regexp, the compiled form. */ - gdb::optional m_compiled_function_regexp; + std::optional m_compiled_function_regexp; /* Enabled/disabled state. */ bool m_enabled = true; -- cgit v1.1