From 7a28f35fdb3c9fd0213ae4e13386c9238478f08c Mon Sep 17 00:00:00 2001 From: Fred Hornsey Date: Thu, 6 Jun 2019 19:07:23 -0500 Subject: tao_idl: Annotations cant class with C++ Keywords --- TAO/TAO_IDL/ast/ast_annotation_decl.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'TAO/TAO_IDL/ast/ast_annotation_decl.cpp') diff --git a/TAO/TAO_IDL/ast/ast_annotation_decl.cpp b/TAO/TAO_IDL/ast/ast_annotation_decl.cpp index 5ccaba059f2..0f16cdf962c 100644 --- a/TAO/TAO_IDL/ast/ast_annotation_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_annotation_decl.cpp @@ -46,6 +46,7 @@ IMPL_NARROW_FROM_SCOPE (AST_Annotation_Decl) void AST_Annotation_Decl::escape_name (Identifier *name) { + FE_Utils::original_local_name (name); // Annotations can't class with C++ Keywords char *old_name = name->get_string (); char *new_name = new char [ACE_OS::strlen (old_name) + 2]; // '@' and '\0' if (new_name) -- cgit v1.2.1 From 6156438d623bc933ba77e9114d174494ba109972 Mon Sep 17 00:00:00 2001 From: Fred Hornsey Date: Wed, 12 Jun 2019 13:31:46 -0500 Subject: Apply suggestions from by @mitza-oci Co-Authored-By: Adam Mitz --- TAO/TAO_IDL/ast/ast_annotation_decl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'TAO/TAO_IDL/ast/ast_annotation_decl.cpp') diff --git a/TAO/TAO_IDL/ast/ast_annotation_decl.cpp b/TAO/TAO_IDL/ast/ast_annotation_decl.cpp index 0f16cdf962c..45eab38d7d6 100644 --- a/TAO/TAO_IDL/ast/ast_annotation_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_annotation_decl.cpp @@ -46,7 +46,7 @@ IMPL_NARROW_FROM_SCOPE (AST_Annotation_Decl) void AST_Annotation_Decl::escape_name (Identifier *name) { - FE_Utils::original_local_name (name); // Annotations can't class with C++ Keywords + FE_Utils::original_local_name (name); // Annotations can't clash with C++ keywords char *old_name = name->get_string (); char *new_name = new char [ACE_OS::strlen (old_name) + 2]; // '@' and '\0' if (new_name) -- cgit v1.2.1