aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@ericsson.com>2017-10-15 22:13:22 -0400
committerSimon Marchi <simon.marchi@ericsson.com>2017-10-15 22:13:23 -0400
commit8676616596351876612aa84be798537625348086 (patch)
tree090f51b7fa34e88f9320b630f07ea0e06d5e99b0
parent86e17b6fbc9b224ecceece7a8bb4dd7989f07c7d (diff)
downloadgdb-8676616596351876612aa84be798537625348086.zip
gdb-8676616596351876612aa84be798537625348086.tar.gz
gdb-8676616596351876612aa84be798537625348086.tar.bz2
Fix GDB build without expat
An earlier patch of mine changed parse_traceframe_info to make it return a unique_ptr. I forgot to update the version of the function used in an expat-less build, this patch fixes it. gdb/ChangeLog: * tracepoint.c (parse_traceframe_info): Return a unique_ptr (the !HAVE_LIBEXPAT version).
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/tracepoint.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 25ae470..4ad642a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-15 Simon Marchi <simon.marchi@ericsson.com>
+
+ * tracepoint.c (parse_traceframe_info): Return a unique_ptr
+ (the !HAVE_LIBEXPAT version).
+
2017-10-14 Simon Marchi <simon.marchi@ericsson.com>
* nat/linux-osdata.c (struct pid_pgid_entry) <operator<>: Make
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 9dd8d87..9c07315 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -3958,7 +3958,7 @@ sdata_make_value (struct gdbarch *gdbarch, struct internalvar *var,
#if !defined(HAVE_LIBEXPAT)
-struct traceframe_info *
+struct std::unique_ptr<traceframe_info>
parse_traceframe_info (const char *tframe_info)
{
static int have_warned;