* gxx.gperf (RETURN): Rename to RETURN_KEYWORD to avoid clashes

	with the RTL code RETURN.
	* hash.h: Regenerated.
	* lex.c (reinit_parse_for_block): Use RETURN_KEYWORD.
	* parse.y: Replace RETURN with RETURN_KEYWORD throughout.
	* parse.c: Regenerated.
	* parse.h: Likewise.
	* pt.c: Include varray.h.  Include rtl.h since varray.h requires
	it.
	(inline_parm_levels): New variable.
	(inline_parm_levels_used): Likewise.
	(maybe_begin_member_template_processing): Update them.
	(maybe_end_member_template_processing): Use them, rather than
	guessing how many levels to pop.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26588 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/parse.h b/gcc/cp/parse.h
index 5f21a76..c361542 100644 (file)
--- a/gcc/cp/parse.h
+++ b/gcc/cp/parse.h
@@ -21,7 +21,7 @@ typedef union {long itype; tree ttype; char *strtype; enum tree_code code; flagg
 #define        DEFAULT 277
 #define        BREAK   278
 #define        CONTINUE        279
-#define        RETURN  280
+#define        RETURN_KEYWORD  280
 #define        GOTO    281
 #define        ASM_KEYWORD     282
 #define        TYPEOF  283