[Lldb-commits] [lldb] r117706 - in /lldb/trunk: lldb.xcodeproj/project.pbxproj source/Expression/ClangExpressionDeclMap.cpp

[Sean Callanan]

Author: spyffe
Date: Fri Oct 29 15:30:26 2010
New Revision: 117706

URL: http://llvm.org/viewvc/llvm-project?rev=117706&view=rev
Log:
Overloading is not broken any more.  No need for
an #ifndef.

Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=117706&r1=117705&r2=117706&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Fri Oct 29 15:30:26 2010
@@ -3087,6 +3087,7 @@
 				);
 				LLVM_BUILD_DIR = "$(SRCROOT)/llvm";
 				LLVM_CONFIGURATION = "Debug+Asserts";
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-DFOR_DYLD=0",
 					"-DSUPPORT_REMOTE_UNWINDING",

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=117706&r1=117705&r2=117706&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Fri Oct 29 15:30:26 2010
@@ -1288,9 +1288,6 @@
     
     if (fun)
     {
-#define BROKEN_OVERLOADING
-        // Awaiting a fix on the Clang side
-#ifndef BROKEN_OVERLOADING
         Type *fun_type = fun->GetType();
         
         if (!fun_type) 
@@ -1316,11 +1313,6 @@
         void *copied_type = ClangASTContext::CopyType(context.GetASTContext(), fun_ast_context, fun_opaque_type);
         
         fun_decl = context.AddFunDecl(copied_type);
-#else
-        fun_address = &fun->GetAddressRange().GetBaseAddress();
-        
-        fun_decl = context.AddGenericFunDecl();
-#endif
     }
     else if (symbol)
     {