ChangeLogTag: Fri Jun 18 11:20:00 UTC 2010 Simon Massey <simon dot massey at prismtech dot com>

2 files changed, 17 insertions, 3 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index af0c30bfd3d..c796cb7aaa5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Fri Jun 18 11:20:00 UTC 2010  Simon Massey  <simon dot massey at prismtech dot com>
+
+        * TAO_IDL/util/utl_scope.cpp:
+
+          Having talked this though with Jeff Parsons, we now have the
+          correct version of the call to add_to_referenced() at the end
+          of the lookup_by_name () function. Basically we always add to
+          the actual scope that the name was found in, and the name is
+          always the first real identifer in the ScopedName (not the
+          global scope empty identifier, if given).
+
 Thu Jun 17 15:20:00 UTC 2010  Simon Massey  <simon dot massey at prismtech dot com>
 
         * TAO_IDL/util/utl_scope.cpp:
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
index d9e192433b3..db212c1a351 100644
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/TAO/TAO_IDL/util/utl_scope.cpp
@@ -1285,15 +1285,19 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
     }
 
   UTL_Scope *work = this;
-  Identifier *const name = e->head ();
 
   // If name starts with "::" or "" start lookup in global scope,
   // if we're not there already, short_circuiting the
   // scope-expanding iteration below.
+  Identifier *name = e->head ();
   const bool global_scope_name = work->is_global_name (name);
   if (global_scope_name)
     {
+      // Remove the preceeding "::" or "" from the scopename
       e = static_cast<UTL_ScopedName *> (e->tail ());
+      name = e->head ();
+
+      // Move directly to the root scope
       work = idl_global->root ();
     }
 
@@ -1340,10 +1344,9 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
                 }
             }
         }
-
-      this->add_to_referenced (d, false, name);
     }
 
+  work->add_to_referenced (d, false, name); // Doesn't add if !d
   masks.reset ();
   return d;
 }