diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-04-07 06:51:10 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-04-07 06:51:10 +0000 |
| commit | 8bd973c90bb113897d30bf1a0c4e4964a9ec230a (patch) | |
| tree | c42b2f7f4e0db14aca8940b27c213d1c06fc8cb9 | |
| parent | 33c161c02f4a30e29f60dba904a3ebe7edda0fb5 (diff) | |
| download | bcm5719-llvm-8bd973c90bb113897d30bf1a0c4e4964a9ec230a.tar.gz bcm5719-llvm-8bd973c90bb113897d30bf1a0c4e4964a9ec230a.zip | |
Symbol: fix build
TargetOptions is ambiguous due to a definition in LLVM and in clang. This was
exposed by SVN r265640. Update to fix the build against the newer revision.
llvm-svn: 265644
| -rw-r--r-- | lldb/source/Symbol/ClangASTContext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp index b2050fb08cf..69558eb7dba 100644 --- a/lldb/source/Symbol/ClangASTContext.cpp +++ b/lldb/source/Symbol/ClangASTContext.cpp @@ -717,11 +717,11 @@ ClangASTContext::getDiagnosticConsumer() return m_diagnostic_consumer_ap.get(); } -std::shared_ptr<TargetOptions> & +std::shared_ptr<clang::TargetOptions> & ClangASTContext::getTargetOptions() { if (m_target_options_rp.get() == nullptr && !m_target_triple.empty()) { - m_target_options_rp = std::make_shared<TargetOptions>(); + m_target_options_rp = std::make_shared<clang::TargetOptions>(); if (m_target_options_rp.get() != nullptr) m_target_options_rp->Triple = m_target_triple; } |
