This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[pushed] 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).
---
 gdb/ChangeLog    | 5 +++++
 gdb/tracepoint.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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;
-- 
2.7.4


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]