aboutsummaryrefslogtreecommitdiff
path: root/gdbsupport
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2020-06-30 07:53:03 -0600
committerTom Tromey <tromey@adacore.com>2020-06-30 07:53:03 -0600
commit5ac588997c3c2d032d5d5145d9245eb37354c23b (patch)
tree984da0cf53258094e83d06c9bac4b85ef6d798dc /gdbsupport
parent5568cc9ee83148042b853131a33007a9f36ab1eb (diff)
downloadgdb-5ac588997c3c2d032d5d5145d9245eb37354c23b.zip
gdb-5ac588997c3c2d032d5d5145d9245eb37354c23b.tar.gz
gdb-5ac588997c3c2d032d5d5145d9245eb37354c23b.tar.bz2
Do not define basic_string_view::to_string
gdb's copy of basic_string_view includes a to_string method. However, according to cppreference, this is not a method on the real std::basic_string_view: https://en.cppreference.com/w/cpp/string/basic_string_view This difference matters because gdb_string_view.h will use the standard implementation when built with a C++17 or later. This caused PR build/26183. This patch fixes the problem by changing the method to be a standalone helper function, and then rewriting the uses. Tested by rebuilding with a version of GCC that defaults to C++17. (Note that the build still is not clean; and also I noticed that the libstdc++ string_view forbids the use of nullptr ... I wonder if gdb violates that.) gdb/ChangeLog 2020-06-30 Tom Tromey <tromey@adacore.com> PR build/26183: * ada-lang.c (ada_lookup_name_info::ada_lookup_name_info): Use gdb::to_string. gdbsupport/ChangeLog 2020-06-30 Tom Tromey <tromey@adacore.com> PR build/26183: * gdb_string_view.h (basic_string_view::to_string): Remove. (gdb::to_string): New function.
Diffstat (limited to 'gdbsupport')
-rw-r--r--gdbsupport/ChangeLog6
-rw-r--r--gdbsupport/gdb_string_view.h17
2 files changed, 16 insertions, 7 deletions
diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog
index 4db482b..e1b040d 100644
--- a/gdbsupport/ChangeLog
+++ b/gdbsupport/ChangeLog
@@ -1,3 +1,9 @@
+2020-06-30 Tom Tromey <tromey@adacore.com>
+
+ PR build/26183:
+ * gdb_string_view.h (basic_string_view::to_string): Remove.
+ (gdb::to_string): New function.
+
2020-06-27 Simon Marchi <simon.marchi@efficios.com>
* tdesc.h (class print_xml_feature) <add_line>: Add
diff --git a/gdbsupport/gdb_string_view.h b/gdbsupport/gdb_string_view.h
index c0ae7a8..65124e6 100644
--- a/gdbsupport/gdb_string_view.h
+++ b/gdbsupport/gdb_string_view.h
@@ -245,13 +245,6 @@ namespace gdb {
return { this->_M_str, this->_M_len };
}
- template<typename _Allocator = std::allocator<_CharT>>
- std::basic_string<_CharT, _Traits, _Allocator>
- to_string(const _Allocator& __alloc = _Allocator()) const
- {
- return { this->_M_str, this->_M_len, __alloc };
- }
-
size_type
copy(_CharT* __str, size_type __n, size_type __pos = 0) const
{
@@ -560,4 +553,14 @@ namespace gdb {
#endif // __cplusplus < 201703L
+namespace gdb {
+
+static inline std::string
+to_string(const gdb::string_view &view)
+{
+ return { view.data (), view.size () };
+}
+
+}
+
#endif /* COMMON_GDB_STRING_VIEW_H */