[Lldb-commits] [lldb] r143096 - /lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp

[Sean Callanan]

Author: spyffe
Date: Wed Oct 26 21:10:28 2011
New Revision: 143096

URL: http://llvm.org/viewvc/llvm-project?rev=143096&view=rev
Log:
Liberalized the "id" check a little; now "id" can
be found in namespaces.

Modified:
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=143096&r1=143095&r2=143096&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Wed Oct 26 21:10:28 2011
@@ -2646,15 +2646,17 @@
     
     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 @@
                 
             AddOneType(context, user_type, current_id, false);
         }
-    }
+    } while(0);
 }
 
 clang::ExternalLoadResult