diff options
Diffstat (limited to 'TAO/TAO_IDL/ast/ast_interface.cpp')
-rw-r--r-- | TAO/TAO_IDL/ast/ast_interface.cpp | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp index 8c41d3f43d5..3c43841b2f5 100644 --- a/TAO/TAO_IDL/ast/ast_interface.cpp +++ b/TAO/TAO_IDL/ast/ast_interface.cpp @@ -91,12 +91,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_err.h" #include "utl_identifier.h" #include "utl_indenter.h" -#include "utl_string.h" #include "global_extern.h" #include "nr_extern.h" -#include "ace/streams.h" - ACE_RCSID (ast, ast_interface, "$Id$") @@ -1481,76 +1478,6 @@ AST_Interface::redef_clash (void) return 0; } -// Look through inherited interfaces. -AST_Decl * -AST_Interface::look_in_inherited (UTL_ScopedName *e, - idl_bool treat_as_ref) -{ - AST_Decl *d = 0; - AST_Decl *d_before = 0; - AST_Interface **is = 0; - long nis = -1; - - // Can't look in an interface which was not yet defined. - if (!this->is_defined ()) - { - idl_global->err ()->fwd_decl_lookup (this, - e); - return 0; - } - - // OK, loop through inherited interfaces. - - // (Don't leave the inheritance hierarchy, no module or global ...) - // Find all and report ambiguous results as error. - - for (nis = this->n_inherits (), is = this->inherits (); - nis > 0; - nis--, is++) - { - d = (*is)->lookup_by_name (e, - treat_as_ref, - 0 /* not in parent */); - if (d != 0) - { - if (d_before == 0) - { - // First result found. - d_before = d; - } - else - { - // Conflict against further results? - if (d != d_before) - { - ACE_ERROR ((LM_ERROR, - "warning in %s line %d: ", - idl_global->filename ()->get_string (), - idl_global->lineno ())); - - e->dump (*ACE_DEFAULT_LOG_STREAM); - - ACE_ERROR ((LM_ERROR, - " is ambiguous in scope.\n" - "Found ")); - - d->name ()->dump (*ACE_DEFAULT_LOG_STREAM); - - ACE_ERROR ((LM_ERROR, - " and ")); - - d_before->name ()->dump (*ACE_DEFAULT_LOG_STREAM); - - ACE_ERROR ((LM_ERROR, - ".\n")); - } - } - } - } - - return d_before; -} - AST_Decl * AST_Interface::lookup_for_add (AST_Decl *d, idl_bool /* treat_as_ref */) |