Re: [PATCH c++ 12/12] ada-lang.h: Add cast in GROW_VECT

[Simon Marchi <simon.marchi@polymtl.ca>]

On 27/10/15 08:13 AM, Pedro Alves wrote:
> It's certainly fine with me.
> 
> Thanks,
> Pedro Alves

Ok, pushed.


From a480de357b17b1b2057b8375284079ccafae39db Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Tue, 27 Oct 2015 09:27:40 -0400
Subject: [PATCH] ada-lang.h: Add cast in GROW_VECT

The assignment requires a cast in C++.  We only use this macro for
vectors of chars, so adding (char *) diretly will do for now.

gdb/ChangeLog:

	* ada-lang.h (GROW_VECT): Add cast.
---
 gdb/ChangeLog  | 4 ++++
 gdb/ada-lang.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 27ea4f6..7b78890 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-27  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* ada-lang.h (GROW_VECT): Add cast.
+
 2015-10-26  Doug Evans  <xdje42@gmail.com>
 
 	* symtab.h (struct general_symbol_info> <ada_mangled>: Update comment.
diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
index 62896f1..7c527cc 100644
--- a/gdb/ada-lang.h
+++ b/gdb/ada-lang.h
@@ -147,7 +147,7 @@ struct ada_task_info
    least M objects, updating V and S as necessary.  */
 
 #define GROW_VECT(v, s, m)                                    \
-   if ((s) < (m)) (v) = grow_vect (v, &(s), m, sizeof *(v));
+   if ((s) < (m)) (v) = (char *) grow_vect (v, &(s), m, sizeof *(v));
 
 extern void *grow_vect (void *, size_t *, size_t, int);
 
-- 
2.6.1