diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-12 17:59:37 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-12 17:59:37 +0000 |
| commit | 96f75fdfc0a8d4be58326abd62b03afc0947c673 (patch) | |
| tree | 4f325bfa8ea577c32c9cd38a56c1d9fb90b3be6d /TAO/TAO_IDL/util/utl_scope.cpp | |
| parent | 333a62d97eaa40754632b5663a4aa9813ea658c7 (diff) | |
| download | ATCD-96f75fdfc0a8d4be58326abd62b03afc0947c673.tar.gz | |
Modified lookup function to catch use of 'int'
as a type.
Diffstat (limited to 'TAO/TAO_IDL/util/utl_scope.cpp')
| -rw-r--r-- | TAO/TAO_IDL/util/utl_scope.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index af76203b784..bd5c9e081aa 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -937,11 +937,11 @@ UTL_Scope::lookup_by_name_local (Identifier *e, * Implements lookup by name for scoped names */ AST_Decl * -UTL_Scope::lookup_by_name(UTL_ScopedName *e, - idl_bool treat_as_ref, - idl_bool in_parent, - long start_index, - long scope_offset) +UTL_Scope::lookup_by_name (UTL_ScopedName *e, + idl_bool treat_as_ref, + idl_bool in_parent, + long start_index, + long scope_offset) { AST_Decl *d; UTL_Scope *t = NULL; @@ -1000,7 +1000,8 @@ UTL_Scope::lookup_by_name(UTL_ScopedName *e, { d = lookup_by_name_local (e->head (), treat_as_ref, - index, scope_offset); + index, + scope_offset); // If we have popped up to a parent scope, we // must check the other children, if we haven't @@ -1017,7 +1018,11 @@ UTL_Scope::lookup_by_name(UTL_ScopedName *e, { d = iter->item (); UTL_Scope *t = DeclAsScope (d); - if (t != NULL) + if (t == NULL) + { + d = NULL; + } + else { AST_Interface *i = AST_Interface::narrow_from_scope (t); |