diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-06-17 15:20:25 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-06-17 15:20:25 +0000 |
| commit | 12a21da13ce9281e1cc3ebb0a684539689b83442 (patch) | |
| tree | 632cd916f84f1c715025900591bc9a0548f600dd | |
| parent | 7523f82e8a0cb9e4e1ecde5b4f08675ba18b151a (diff) | |
| download | ATCD-12a21da13ce9281e1cc3ebb0a684539689b83442.tar.gz | |
ChangeLogTag: Thu Jun 17 15:20:00 UTC 2010 Simon Massey <simon dot massey at prismtech dot com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/TAO_IDL/util/utl_scope.cpp | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9205c573052..af0c30bfd3d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 17 15:20:00 UTC 2010 Simon Massey <simon dot massey at prismtech dot com> + + * TAO_IDL/util/utl_scope.cpp: + + only add_to_referenced if not searching at global scope. + Thu Jun 17 13:55:57 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_visitor_operation/operation_ch.cpp: diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index 7718f187ee1..d9e192433b3 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -1340,10 +1340,11 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, } } } + + this->add_to_referenced (d, false, name); } masks.reset (); - this->add_to_referenced (d, false, name); return d; } |