summaryrefslogtreecommitdiff
path: root/TAO/TAO_IDL/fe/idl.ypp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/TAO_IDL/fe/idl.ypp')
-rw-r--r--TAO/TAO_IDL/fe/idl.ypp4
1 files changed, 4 insertions, 0 deletions
diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp
index f0b51967b8b..87715d364ec 100644
--- a/TAO/TAO_IDL/fe/idl.ypp
+++ b/TAO/TAO_IDL/fe/idl.ypp
@@ -2323,6 +2323,8 @@ annotation_member
AST_Expression::ExprType type = $1;
Identifier *name = $2;
+ // Annotation member names can't clash with C++ keywords
+ FE_Utils::original_local_name (name);
UTL_ScopedName *scoped_name = new UTL_ScopedName (name, 0);
AST_Expression *default_value = $3;
@@ -2546,6 +2548,8 @@ named_annotation_appl_param
{
AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param;
param->id = $1;
+ // Annotation Member Names Can't Clash with C++ keywords
+ FE_Utils::original_local_name (param->id);
param->expr = $3;
$$ = param;
}