diff options
Diffstat (limited to 'gdb/probe.c')
| -rw-r--r-- | gdb/probe.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gdb/probe.c b/gdb/probe.c index 13e95bc..d9079be 100644 --- a/gdb/probe.c +++ b/gdb/probe.c @@ -36,7 +36,7 @@ #include "location.h" #include <ctype.h> #include <algorithm> -#include "gdbsupport/gdb_optional.h" +#include <optional> /* Class that implements the static probe methods for "any" probe. */ @@ -280,7 +280,7 @@ collect_probes (const std::string &objname, const std::string &provider, const std::string &probe_name, const static_probe_ops *spops) { std::vector<bound_probe> result; - gdb::optional<compiled_regex> obj_pat, prov_pat, probe_pat; + std::optional<compiled_regex> obj_pat, prov_pat, probe_pat; if (!provider.empty ()) prov_pat.emplace (provider.c_str (), REG_NOSUB, @@ -683,9 +683,9 @@ disable_probes_command (const char *arg, int from_tty) static bool ignore_probes_p = false; static bool ignore_probes_idx = 0; static bool ignore_probes_verbose_p; -static gdb::optional<compiled_regex> ignore_probes_prov_pat[2]; -static gdb::optional<compiled_regex> ignore_probes_name_pat[2]; -static gdb::optional<compiled_regex> ignore_probes_obj_pat[2]; +static std::optional<compiled_regex> ignore_probes_prov_pat[2]; +static std::optional<compiled_regex> ignore_probes_name_pat[2]; +static std::optional<compiled_regex> ignore_probes_obj_pat[2]; /* See comments in probe.h. */ @@ -696,11 +696,11 @@ ignore_probe_p (const char *provider, const char *name, if (!ignore_probes_p) return false; - gdb::optional<compiled_regex> &re_prov + std::optional<compiled_regex> &re_prov = ignore_probes_prov_pat[ignore_probes_idx]; - gdb::optional<compiled_regex> &re_name + std::optional<compiled_regex> &re_name = ignore_probes_name_pat[ignore_probes_idx]; - gdb::optional<compiled_regex> &re_obj + std::optional<compiled_regex> &re_obj = ignore_probes_obj_pat[ignore_probes_idx]; bool res @@ -755,11 +755,11 @@ ignore_probes_command (const char *arg, int from_tty) /* Parse the regular expressions, making sure that the old regular expressions are still valid if an exception is throw. */ int new_ignore_probes_idx = 1 - ignore_probes_idx; - gdb::optional<compiled_regex> &re_prov + std::optional<compiled_regex> &re_prov = ignore_probes_prov_pat[new_ignore_probes_idx]; - gdb::optional<compiled_regex> &re_name + std::optional<compiled_regex> &re_name = ignore_probes_name_pat[new_ignore_probes_idx]; - gdb::optional<compiled_regex> &re_obj + std::optional<compiled_regex> &re_obj = ignore_probes_obj_pat[new_ignore_probes_idx]; re_prov.reset (); re_name.reset (); |