[Lldb-commits] [lldb] r168204 - in /lldb/trunk/source: Expression/ClangExpressionParser.cpp Symbol/ClangASTContext.cpp

[Greg Clayton]

Author: gclayton
Date: Fri Nov 16 15:35:22 2012
New Revision: 168204

URL: http://llvm.org/viewvc/llvm-project?rev=168204&view=rev
Log:
Fix lldb to compile with top of tree LLVM/clang.


Modified:
    lldb/trunk/source/Expression/ClangExpressionParser.cpp
    lldb/trunk/source/Symbol/ClangASTContext.cpp

Modified: lldb/trunk/source/Expression/ClangExpressionParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionParser.cpp?rev=168204&r1=168203&r2=168204&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionParser.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionParser.cpp Fri Nov 16 15:35:22 2012
@@ -245,7 +245,7 @@
     
     // Create the target instance.
     m_compiler->setTarget(TargetInfo::CreateTargetInfo(m_compiler->getDiagnostics(),
-                                                       m_compiler->getTargetOpts()));
+                                                       &m_compiler->getTargetOpts()));
     
     assert (m_compiler->hasTarget());
     

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=168204&r1=168203&r2=168204&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Fri Nov 16 15:35:22 2012
@@ -625,7 +625,7 @@
 {
     // target_triple should be something like "x86_64-apple-macosx"
     if (m_target_info_ap.get() == NULL && !m_target_triple.empty())
-        m_target_info_ap.reset (TargetInfo::CreateTargetInfo(*getDiagnosticsEngine(), *getTargetOptions()));
+        m_target_info_ap.reset (TargetInfo::CreateTargetInfo(*getDiagnosticsEngine(), getTargetOptions()));
     return m_target_info_ap.get();
 }