diff options
| -rw-r--r-- | gdb/dwarf2/line-header.c | 4 | ||||
| -rw-r--r-- | gdbsupport/pathstuff.cc | 8 | ||||
| -rw-r--r-- | gdbsupport/pathstuff.h | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/gdb/dwarf2/line-header.c b/gdb/dwarf2/line-header.c index 73db3765c09..3a47557806e 100644 --- a/gdb/dwarf2/line-header.c +++ b/gdb/dwarf2/line-header.c @@ -69,13 +69,13 @@ line_header::file_file_name (const file_entry &fe) const const char *dir = fe.include_dir (this); if (dir != nullptr) - ret = path_join (dir, ret); + ret = path_join (dir, ret.c_str ()); if (IS_ABSOLUTE_PATH (ret)) return ret; if (m_comp_dir != nullptr) - ret = path_join (m_comp_dir, ret); + ret = path_join (m_comp_dir, ret.c_str ()); return ret; } diff --git a/gdbsupport/pathstuff.cc b/gdbsupport/pathstuff.cc index af10c6ebd2e..390f10b1b5e 100644 --- a/gdbsupport/pathstuff.cc +++ b/gdbsupport/pathstuff.cc @@ -191,21 +191,21 @@ child_path (const char *parent, const char *child) /* See gdbsupport/pathstuff.h. */ std::string -path_join (gdb::array_view<const gdb::string_view> paths) +path_join (gdb::array_view<const char *> paths) { std::string ret; for (int i = 0; i < paths.size (); ++i) { - const gdb::string_view path = paths[i]; + const char *path = paths[i]; if (i > 0) - gdb_assert (path.empty () || !IS_ABSOLUTE_PATH (path)); + gdb_assert (strlen (path) == 0 || !IS_ABSOLUTE_PATH (path)); if (!ret.empty () && !IS_DIR_SEPARATOR (ret.back ())) ret += '/'; - ret.append (path.begin (), path.end ()); + ret.append (path); } return ret; diff --git a/gdbsupport/pathstuff.h b/gdbsupport/pathstuff.h index d01db89e085..e0b5bc4f355 100644 --- a/gdbsupport/pathstuff.h +++ b/gdbsupport/pathstuff.h @@ -67,7 +67,7 @@ extern const char *child_path (const char *parent, const char *child); The first element can be absolute or relative. All the others must be relative. */ -extern std::string path_join (gdb::array_view<const gdb::string_view> paths); +extern std::string path_join (gdb::array_view<const char *> paths); /* Same as the above, but accept paths as distinct parameters. */ @@ -78,10 +78,10 @@ path_join (Args... paths) /* It doesn't make sense to join less than two paths. */ gdb_static_assert (sizeof... (Args) >= 2); - std::array<gdb::string_view, sizeof... (Args)> views - { gdb::string_view (paths)... }; + std::array<const char *, sizeof... (Args)> path_array + { paths... }; - return path_join (gdb::array_view<const gdb::string_view> (views)); + return path_join (gdb::array_view<const char *> (path_array)); } /* Return whether PATH contains a directory separator character. */ |