summaryrefslogtreecommitdiff
path: root/modules/TAO/TAO_IDL/util/utl_scope.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'modules/TAO/TAO_IDL/util/utl_scope.cpp')
-rw-r--r--modules/TAO/TAO_IDL/util/utl_scope.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/TAO/TAO_IDL/util/utl_scope.cpp b/modules/TAO/TAO_IDL/util/utl_scope.cpp
index 135a724ba97..22b013c284f 100644
--- a/modules/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/modules/TAO/TAO_IDL/util/utl_scope.cpp
@@ -2107,7 +2107,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
// up was inherited into that interface. The first call to
// look_in_inherited() is this function only checks base classes
// of the scope (interface) we started the lookup from.
- if (d == 0)
+ if (d == 0 && s != 0)
{
d = s->look_in_inherited (sn, treat_as_ref);
}