From: Diego Novillo Date: Thu, 13 Oct 2011 18:26:08 +0000 (-0400) Subject: cp-tree.h (struct language_function): Rename in_function_try_handler to x_in_function... X-Git-Tag: releases/gcc-4.7.0~3139 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce5046bd7184be1aad54e2d8874e136b758c365d;p=thirdparty%2Fgcc.git cp-tree.h (struct language_function): Rename in_function_try_handler to x_in_function_try_handler. * cp-tree.h (struct language_function): Rename in_function_try_handler to x_in_function_try_handler. Rename in_base_initializer to x_in_base_initializer. Update all users. From-SVN: r179940 --- diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 18c98bb3f353..039b155810f2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2011-10-13 Diego Novillo + + * cp-tree.h (struct language_function): Rename in_function_try_handler + to x_in_function_try_handler. + Rename in_base_initializer to x_in_base_initializer. + Update all users. + 2011-10-13 Diego Novillo * class.c (sorted_fields_type_new): Factor out of ... diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index b53accfed654..1b896b819870 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -1053,8 +1053,8 @@ struct GTY(()) language_function { BOOL_BITFIELD returns_value : 1; BOOL_BITFIELD returns_null : 1; BOOL_BITFIELD returns_abnormally : 1; - BOOL_BITFIELD in_function_try_handler : 1; - BOOL_BITFIELD in_base_initializer : 1; + BOOL_BITFIELD x_in_function_try_handler : 1; + BOOL_BITFIELD x_in_base_initializer : 1; /* True if this function can throw an exception. */ BOOL_BITFIELD can_throw : 1; @@ -1121,9 +1121,9 @@ struct GTY(()) language_function { cp_function_chain->returns_abnormally /* Nonzero if we are processing a base initializer. Zero elsewhere. */ -#define in_base_initializer cp_function_chain->in_base_initializer +#define in_base_initializer cp_function_chain->x_in_base_initializer -#define in_function_try_handler cp_function_chain->in_function_try_handler +#define in_function_try_handler cp_function_chain->x_in_function_try_handler /* Expression always returned from function, or error_mark_node otherwise, for use by the automatic named return value optimization. */