From b1e8c0fdac7d65fa094be8b4db75d16e3a9900b6 Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Mon, 2 Aug 2004 16:45:52 +0000 Subject: [PATCH] libiberty.h (XDELETE, [...]): Remove any const-qualification before disposal. include/ * libiberty.h (XDELETE, XDELETEVEC, XRESIZEVEC): Remove any const-qualification before disposal. gcc/ * vec.h (DEF_VEC_P): Add proper cast to uses of vec_o_reserve and vec_p_reserve. * langhooks.h (lang_hooks::builtin_function): Rename parameter from "class" to "bt_class". From-SVN: r85441 --- gcc/ChangeLog | 7 +++++++ gcc/langhooks.h | 2 +- gcc/vec.h | 12 ++++++------ include/ChangeLog | 5 +++++ include/libiberty.h | 6 +++--- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7dc0a5b503c..23750e3751a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2004-08-02 Gabriel Dos Reis + + * vec.h (DEF_VEC_P): Add proper cast to uses of vec_o_reserve and + vec_p_reserve. + * langhooks.h (lang_hooks::builtin_function): Rename parameter + from "class" to "bt_class". + 2004-08-02 Paul Brook PR rtl-optimization/15068 diff --git a/gcc/langhooks.h b/gcc/langhooks.h index 04dc114d2b7..108b4515e31 100644 --- a/gcc/langhooks.h +++ b/gcc/langhooks.h @@ -411,7 +411,7 @@ struct lang_hooks the name to be called if we can't opencode the function. If ATTRS is nonzero, use that for the function's attribute list. */ tree (*builtin_function) (const char *name, tree type, int function_code, - enum built_in_class class, + enum built_in_class bt_class, const char *library_name, tree attrs); /* Whenever you add entries here, make sure you adjust langhooks-def.h diff --git a/gcc/vec.h b/gcc/vec.h index 885e5473610..33d9bf6a6dd 100644 --- a/gcc/vec.h +++ b/gcc/vec.h @@ -390,7 +390,7 @@ static inline int VEC_OP (TDEF,iterate) \ static inline VEC (TDEF) *VEC_OP (TDEF,alloc) \ (int alloc_ MEM_STAT_DECL) \ { \ - return vec_p_reserve (NULL, alloc_ - !alloc_ PASS_MEM_STAT); \ + return (VEC (TDEF) *) vec_p_reserve (NULL, alloc_ - !alloc_ PASS_MEM_STAT);\ } \ \ static inline size_t VEC_OP (TDEF,embedded_size) \ @@ -419,7 +419,7 @@ static inline int VEC_OP (TDEF,reserve) \ int extend = VEC_OP (TDEF,space) (*vec_, alloc_); \ \ if (extend) \ - *vec_ = vec_p_reserve (*vec_, alloc_ PASS_MEM_STAT); \ + *vec_ = (VEC (TDEF) *) vec_p_reserve (*vec_, alloc_ PASS_MEM_STAT); \ \ return extend; \ } \ @@ -583,9 +583,9 @@ static inline int VEC_OP (TDEF,iterate) \ static inline VEC (TDEF) *VEC_OP (TDEF,alloc) \ (int alloc_ MEM_STAT_DECL) \ { \ - return vec_o_reserve (NULL, alloc_ - !alloc_, \ - offsetof (VEC(TDEF),vec), sizeof (TDEF) \ - PASS_MEM_STAT); \ + return (VEC (TDEF) *) vec_o_reserve (NULL, alloc_ - !alloc_, \ + offsetof (VEC(TDEF),vec), sizeof (TDEF)\ + PASS_MEM_STAT); \ } \ \ static inline size_t VEC_OP (TDEF,embedded_size) \ @@ -614,7 +614,7 @@ static inline int VEC_OP (TDEF,reserve) \ int extend = VEC_OP (TDEF,space) (*vec_, alloc_); \ \ if (extend) \ - *vec_ = vec_o_reserve (*vec_, alloc_, \ + *vec_ = (VEC (TDEF) *) vec_o_reserve (*vec_, alloc_, \ offsetof (VEC(TDEF),vec), sizeof (TDEF) \ PASS_MEM_STAT); \ \ diff --git a/include/ChangeLog b/include/ChangeLog index e62b3628190..6fabb45307b 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2004-08-02 Gabriel Dos Reis + + * libiberty.h (XDELETE, XDELETEVEC, XRESIZEVEC): Remove any + const-qualification before disposal. + 2004-07-24 Bernardo Innocenti * ansidecl.h (ARG_UNUSED): New Macro. diff --git a/include/libiberty.h b/include/libiberty.h index 68eeeae7396..a90b4ddcbe8 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -261,14 +261,14 @@ extern double physmem_available PARAMS ((void)); #define XNEW(T) ((T *) xmalloc (sizeof (T))) #define XCNEW(T) ((T *) xcalloc (1, sizeof (T))) -#define XDELETE(P) free ((P)) +#define XDELETE(P) free ((void*) (P)) /* Array allocators. */ #define XNEWVEC(T, N) ((T *) xmalloc (sizeof (T) * (N))) #define XCNEWVEC(T, N) ((T *) xcalloc ((N), sizeof (T))) -#define XRESIZEVEC(T, P, N) ((T *) xrealloc ((P), sizeof (T) * (N))) -#define XDELETEVEC(P) free ((P)) +#define XRESIZEVEC(T, P, N) ((T *) xrealloc ((void *) (P), sizeof (T) * (N))) +#define XDELETEVEC(P) free ((void*) (P)) /* Allocators for variable-sized structures and raw buffers. */ -- 2.30.2