summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-04-20 21:21:28 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-04-20 21:21:28 +0000
commitd44a35e87e405ae98902dc491ba70ed82f58f592 (patch)
treec943b2e42186cf1629dc15a3b6604514996993ee /include
parent74a628f776edb588bff8f8f5cc16eac947c9d631 (diff)
Vendor import of lldb trunk r300890:vendor/lldb/lldb-trunk-r300890
Notes
svn path=/vendor/lldb/dist/; revision=317228 svn path=/vendor/lldb/lldb-trunk-r300890/; revision=317229; tag=vendor/lldb/lldb-trunk-r300890
Diffstat (limited to 'include')
-rw-r--r--include/lldb/Core/ArchSpec.h1
-rw-r--r--include/lldb/Expression/DiagnosticManager.h2
-rw-r--r--include/lldb/Utility/StringLexer.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/include/lldb/Core/ArchSpec.h b/include/lldb/Core/ArchSpec.h
index 648815c21371..75c7079be08d 100644
--- a/include/lldb/Core/ArchSpec.h
+++ b/include/lldb/Core/ArchSpec.h
@@ -625,6 +625,7 @@ public:
protected:
bool IsEqualTo(const ArchSpec &rhs, bool exact_match) const;
+ void UpdateCore();
llvm::Triple m_triple;
Core m_core = kCore_invalid;
diff --git a/include/lldb/Expression/DiagnosticManager.h b/include/lldb/Expression/DiagnosticManager.h
index d9024e649b80..83e67df2649a 100644
--- a/include/lldb/Expression/DiagnosticManager.h
+++ b/include/lldb/Expression/DiagnosticManager.h
@@ -128,6 +128,8 @@ public:
m_diagnostics.push_back(diagnostic);
}
+ void CopyDiagnostics(DiagnosticManager &otherDiagnostics);
+
size_t Printf(DiagnosticSeverity severity, const char *format, ...)
__attribute__((format(printf, 3, 4)));
size_t PutString(DiagnosticSeverity severity, llvm::StringRef str);
diff --git a/include/lldb/Utility/StringLexer.h b/include/lldb/Utility/StringLexer.h
index e2c31db329cc..e4fc81a85e0d 100644
--- a/include/lldb/Utility/StringLexer.h
+++ b/include/lldb/Utility/StringLexer.h
@@ -41,8 +41,6 @@ public:
bool HasAtLeast(Size s);
- bool HasAny(Character c);
-
std::string GetUnlexed();
// This will assert if there are less than s characters preceding the cursor.