*** src/tool/omniidl2/util/utl_scope.cc 1999/09/14 17:41:27 1.10 --- newsrc/tool/omniidl2/util/utl_scope.cc 1999/12/17 18:02:52 1.10.2.1 *************** *** 815,823 **** */ for (nis = i->n_inherits(), is = i->inherits(); nis > 0; nis--, is++) { d = (*is)->lookup_by_name_local(e->head(),treat_as_ref); ! if (d && e->tail()) d = iter_lookup_by_name_local(d,e,treat_as_ref); ! if (d != NULL) ! return d; } /* * Not found --- 815,834 ---- */ for (nis = i->n_inherits(), is = i->inherits(); nis > 0; nis--, is++) { d = (*is)->lookup_by_name_local(e->head(),treat_as_ref); ! ! if (d) { ! // Found first naming component in this inherited interface ! if (e->tail()) { ! // More name components to go ! d = iter_lookup_by_name_local(d,e,treat_as_ref); ! } ! if (d) return d; ! } ! else { ! // Not found in this interface. How about ones it inherits from? ! d = (*is)->look_in_inherited(e, treat_as_ref); ! if (d) return d; ! } } /* * Not found