diff options
Diffstat (limited to 'TAO/TAO_IDL/ast/ast_interface.cpp')
-rw-r--r-- | TAO/TAO_IDL/ast/ast_interface.cpp | 122 |
1 files changed, 0 insertions, 122 deletions
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp index 71295c767c3..762f4001986 100644 --- a/TAO/TAO_IDL/ast/ast_interface.cpp +++ b/TAO/TAO_IDL/ast/ast_interface.cpp @@ -806,128 +806,6 @@ AST_Interface::compare_names (AST_Interface *that, return I_TRUE; } -void -AST_Interface::inherited_name_clash () -{ - AST_Decl *my_member, *parent1_member, *parent2_member; - - // Compare our members with those of each parent. - - UTL_ScopeActiveIterator *my_members = - new UTL_ScopeActiveIterator (DeclAsScope (this), - UTL_Scope::IK_decls); - - while (!(my_members->is_done ())) - { - my_member = my_members->item (); - Identifier *id = my_member->local_name (); - - for (int i = 0; i < this->pd_n_inherits; i ++) - { - UTL_ScopeActiveIterator *parent_members = - new UTL_ScopeActiveIterator (DeclAsScope (pd_inherits[i]), - UTL_Scope::IK_decls); - - while (!(parent_members->is_done ())) - { - parent1_member = parent_members->item (); - Identifier *pid = parent1_member->local_name (); - - if (id->compare (pid) == I_TRUE) - { - idl_global->err ()->error2 (UTL_Error::EIDL_REDEF, - my_member, - parent1_member); - } - else if (id->case_compare_quiet (pid) == I_TRUE) - { - if (idl_global->case_diff_error ()) - { - idl_global->err ()->error2 (UTL_Error::EIDL_NAME_CASE_ERROR, - my_member, - parent1_member); - } - else - { - idl_global->err ()->warning2 (UTL_Error::EIDL_NAME_CASE_WARNING, - my_member, - parent1_member); - } - } - - parent_members->next (); - } - - delete parent_members; - } - - my_members->next (); - } - - delete my_members; - - // Now compare members of each parent with each other. - - for (int i = 0; i < this->pd_n_inherits - 1; i++) - { - UTL_ScopeActiveIterator *parent1_members = - new UTL_ScopeActiveIterator (DeclAsScope (pd_inherits[i]), - UTL_Scope::IK_decls); - - while (!(parent1_members->is_done ())) - { - parent1_member = parent1_members->item (); - Identifier *pid1 = parent1_member->local_name (); - - for (int j = i + 1; j < this->pd_n_inherits; j++) - { - UTL_ScopeActiveIterator *parent2_members = - new UTL_ScopeActiveIterator (DeclAsScope (pd_inherits[j]), - UTL_Scope::IK_decls); - - while (!(parent2_members->is_done ())) - { - parent2_member = parent2_members->item (); - Identifier *pid2 = parent2_member->local_name (); - - if (pid1->compare (pid2) == I_TRUE) - { - idl_global->err ()->error3 (UTL_Error::EIDL_REDEF, - this, - parent1_member, - parent2_member); - } - else if (pid1->case_compare_quiet (pid2) == I_TRUE) - { - if (idl_global->case_diff_error ()) - { - idl_global->err ()->error3 (UTL_Error::EIDL_NAME_CASE_ERROR, - this, - parent1_member, - parent2_member); - } - else - { - idl_global->err ()->warning3 (UTL_Error::EIDL_NAME_CASE_WARNING, - this, - parent1_member, - parent2_member); - } - } - - parent2_members->next (); - } - - delete parent2_members; - } - - parent1_members->next (); - } - - delete parent1_members; - } -} - /* * Narrowing methods */ |