diff options
| author | Lancelot Six <lancelot.six@amd.com> | 2023-10-13 09:27:48 +0000 |
|---|---|---|
| committer | Lancelot Six <lancelot.six@amd.com> | 2023-11-21 11:52:35 +0000 |
| commit | 6b09f1342cf2d8e2b13a0d634acc3bcf2852a73b (patch) | |
| tree | 07259601270022a6cbeb89826560262f015e1589 /gdbserver | |
| parent | 6b62451ad08056f0ba02e192ec34ef67c4294ef4 (diff) | |
| download | fsf-binutils-gdb-6b09f1342cf2d8e2b13a0d634acc3bcf2852a73b.zip fsf-binutils-gdb-6b09f1342cf2d8e2b13a0d634acc3bcf2852a73b.tar.gz fsf-binutils-gdb-6b09f1342cf2d8e2b13a0d634acc3bcf2852a73b.tar.bz2 | |
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 <optional>
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 <tom@tromey.com>
Approved-By: Pedro Alves <pedro@palves.net>
Diffstat (limited to 'gdbserver')
| -rw-r--r-- | gdbserver/linux-aarch64-low.cc | 4 | ||||
| -rw-r--r-- | gdbserver/regcache.cc | 4 | ||||
| -rw-r--r-- | gdbserver/regcache.h | 2 | ||||
| -rw-r--r-- | gdbserver/win32-low.cc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc index fcbe7bb..7045465 100644 --- a/gdbserver/linux-aarch64-low.cc +++ b/gdbserver/linux-aarch64-low.cc @@ -299,7 +299,7 @@ aarch64_fill_tlsregset (struct regcache *regcache, void *buf) collect_register (regcache, tls_regnum, tls_buf); /* Read TPIDR2, if it exists. */ - gdb::optional<int> regnum = find_regno_no_throw (regcache->tdesc, "tpidr2"); + std::optional<int> regnum = find_regno_no_throw (regcache->tdesc, "tpidr2"); if (regnum.has_value ()) collect_register (regcache, *regnum, tls_buf + sizeof (uint64_t)); @@ -316,7 +316,7 @@ aarch64_store_tlsregset (struct regcache *regcache, const void *buf) supply_register (regcache, tls_regnum, tls_buf); /* Write TPIDR2, if it exists. */ - gdb::optional<int> regnum = find_regno_no_throw (regcache->tdesc, "tpidr2"); + std::optional<int> regnum = find_regno_no_throw (regcache->tdesc, "tpidr2"); if (regnum.has_value ()) supply_register (regcache, *regnum, tls_buf + sizeof (uint64_t)); diff --git a/gdbserver/regcache.cc b/gdbserver/regcache.cc index 0b11416..2e75a94 100644 --- a/gdbserver/regcache.cc +++ b/gdbserver/regcache.cc @@ -249,7 +249,7 @@ registers_from_string (struct regcache *regcache, char *buf) /* See regcache.h */ -gdb::optional<int> +std::optional<int> find_regno_no_throw (const struct target_desc *tdesc, const char *name) { for (int i = 0; i < tdesc->reg_defs.size (); ++i) @@ -263,7 +263,7 @@ find_regno_no_throw (const struct target_desc *tdesc, const char *name) int find_regno (const struct target_desc *tdesc, const char *name) { - gdb::optional<int> regnum = find_regno_no_throw (tdesc, name); + std::optional<int> regnum = find_regno_no_throw (tdesc, name); if (regnum.has_value ()) return *regnum; diff --git a/gdbserver/regcache.h b/gdbserver/regcache.h index 7248bcf..4700c03 100644 --- a/gdbserver/regcache.h +++ b/gdbserver/regcache.h @@ -112,7 +112,7 @@ int register_size (const struct target_desc *tdesc, int n); /* No throw version of find_regno. If NAME is not a known register, return an empty value. */ -gdb::optional<int> find_regno_no_throw (const struct target_desc *tdesc, +std::optional<int> find_regno_no_throw (const struct target_desc *tdesc, const char *name); int find_regno (const struct target_desc *tdesc, const char *name); diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 3246957..3842c80 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1019,7 +1019,7 @@ get_child_debug_event (DWORD *continue_status, windows_process.attaching = 0; { - gdb::optional<pending_stop> stop + std::optional<pending_stop> stop = windows_process.fetch_pending_stop (debug_threads); if (stop.has_value ()) { |