aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/osdata.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3fdeae1..bb3bf4e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2017-11-23 Simon Marchi <simon.marchi@ericsson.com>
+ * osdata.c (osdata_end_column, get_osdata): Remove std::move.
+
+2017-11-23 Simon Marchi <simon.marchi@ericsson.com>
+
* varobj.c (struct varobj_dynamic) <children_requested_>: Rename
back to...
<children_requested>: ... this.
diff --git a/gdb/osdata.c b/gdb/osdata.c
index f013d0f..a82cbf1 100644
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -104,7 +104,7 @@ osdata_end_column (struct gdb_xml_parser *parser,
osdata_item &item = osdata->items.back ();
item.columns.emplace_back (std::move (data->property_name),
- std::move (std::string (body_text)));
+ std::string (body_text));
}
/* The allowed elements and attributes for OS data object.
@@ -178,7 +178,7 @@ get_osdata (const char *type)
if (osdata == NULL)
error (_("Can not fetch data now."));
- return std::move (osdata);
+ return osdata;
}
const std::string *