From 51d619308377f16a8ff13df95becfe2282198844 Mon Sep 17 00:00:00 2001 From: bstarynk Date: Mon, 17 Sep 2012 05:30:37 +0000 Subject: 2012-09-17 Basile Starynkevitch MELT branch merged with trunk rev 191371 using svnmerge. [gcc/] 2012-09-17 Basile Starynkevitch {{when merging trunk svn rev 191371}} * melt-runtime.c (melt_load_module_index): Push an empty slot, not a null pointer, into melt_modinfvec. (meltgc_run_c_extension): Push an empty slot, not a null pointer, into melt_extinfvec. (melt_really_initialize): Better indentation, and increase maximal minore size to 32768Kwords. Push an empty slot, not a null pointer, into melt_modinfvec. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@191373 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/decl2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gcc/cp/decl2.c') diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index f76b59605ae..0df461340bc 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -3037,8 +3037,8 @@ get_priority_info (int priority) it's DECL_CONTECT() properly set. */ static tree fix_temporary_vars_context_r (tree *node, - int *unused ATTRIBUTE_UNUSED, - void *unused1 ATTRIBUTE_UNUSED) + int * /*unused*/, + void * /*unused1*/) { gcc_assert (current_function_decl); @@ -3656,7 +3656,7 @@ collect_all_refs (const char *source_file) /* Clear DECL_EXTERNAL for NODE. */ static bool -clear_decl_external (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED) +clear_decl_external (struct cgraph_node *node, void * /*data*/) { DECL_EXTERNAL (node->symbol.decl) = 0; return false; -- cgit v1.2.1