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 /gdb/xml-support.c | |
| parent | 6b62451ad08056f0ba02e192ec34ef67c4294ef4 (diff) | |
| download | binutils-6b09f1342cf2d8e2b13a0d634acc3bcf2852a73b.zip binutils-6b09f1342cf2d8e2b13a0d634acc3bcf2852a73b.tar.gz binutils-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 'gdb/xml-support.c')
| -rw-r--r-- | gdb/xml-support.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gdb/xml-support.c b/gdb/xml-support.c index 0c98dc7..2d231b6 100644 --- a/gdb/xml-support.c +++ b/gdb/xml-support.c @@ -785,7 +785,7 @@ xinclude_start_include (struct gdb_xml_parser *parser, gdb_xml_error (parser, _("Maximum XInclude depth (%d) exceeded"), MAX_XINCLUDE_DEPTH); - gdb::optional<gdb::char_vector> text = data->fetcher (href); + std::optional<gdb::char_vector> text = data->fetcher (href); if (!text) gdb_xml_error (parser, _("Could not load XML document \"%s\""), href); @@ -960,7 +960,7 @@ show_debug_xml (struct ui_file *file, int from_tty, gdb_printf (file, _("XML debugging is %s.\n"), value); } -gdb::optional<gdb::char_vector> +std::optional<gdb::char_vector> xml_fetch_content_from_file (const char *filename, const char *dirname) { gdb_file_up file; |