Liberalized the "id" check a little; now "id" can

be found in namespaces.

llvm-svn: 143096

1 files changed, 5 insertions, 3 deletions

diff --git a/lldb/source/Expression/ClangExpressionDeclMap.cpp b/lldb/source/Expression/ClangExpressionDeclMap.cpp
index 9acf8c21b52..64a2508fb87 100644
--- a/lldb/source/Expression/ClangExpressionDeclMap.cpp
+++ b/lldb/source/Expression/ClangExpressionDeclMap.cpp
@@ -2646,15 +2646,17 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
     
     static ConstString id_name("id");
     
-    if (name != id_name)
+    do 
     {
         TypeList types;
         SymbolContext null_sc;
         
         if (module_sp && namespace_decl)
             module_sp->FindTypes(null_sc, name, &namespace_decl, true, 1, types);
-        else
+        else if(name != id_name)
             target->GetImages().FindTypes (null_sc, name, true, 1, types);
+        else
+            break;
         
         if (types.GetSize())
         {
@@ -2675,7 +2677,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
                 
             AddOneType(context, user_type, current_id, false);
         }
-    }
+    } while(0);
 }
 
 clang::ExternalLoadResult