summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2016-11-13 03:05:58 +0000
committerZachary Turner <zturner@google.com>2016-11-13 03:05:58 +0000
commit7a120c8b3df60a5da382f8f7baeaccdfa928bd5b (patch)
tree2d6db437b35e241ea84a9abdd74990459dee525c
parent988968394d7f63fe9bc0ec0bfcd5e633d611be1a (diff)
downloadbcm5719-llvm-7a120c8b3df60a5da382f8f7baeaccdfa928bd5b.tar.gz
bcm5719-llvm-7a120c8b3df60a5da382f8f7baeaccdfa928bd5b.zip
Change IOHandlerConfirm to use StringRefs.
llvm-svn: 286743
-rw-r--r--lldb/include/lldb/Core/IOHandler.h2
-rw-r--r--lldb/include/lldb/Interpreter/CommandInterpreter.h3
-rw-r--r--lldb/source/Core/IOHandler.cpp2
-rw-r--r--lldb/source/Interpreter/CommandInterpreter.cpp2
4 files changed, 4 insertions, 5 deletions
diff --git a/lldb/include/lldb/Core/IOHandler.h b/lldb/include/lldb/Core/IOHandler.h
index 1ee815071c2..2e6ff31ee68 100644
--- a/lldb/include/lldb/Core/IOHandler.h
+++ b/lldb/include/lldb/Core/IOHandler.h
@@ -458,7 +458,7 @@ protected:
// to see how.
class IOHandlerConfirm : public IOHandlerDelegate, public IOHandlerEditline {
public:
- IOHandlerConfirm(Debugger &debugger, const char *prompt,
+ IOHandlerConfirm(Debugger &debugger, llvm::StringRef prompt,
bool default_response);
~IOHandlerConfirm() override;
diff --git a/lldb/include/lldb/Interpreter/CommandInterpreter.h b/lldb/include/lldb/Interpreter/CommandInterpreter.h
index 3bb62f9a802..cad6fbb136c 100644
--- a/lldb/include/lldb/Interpreter/CommandInterpreter.h
+++ b/lldb/include/lldb/Interpreter/CommandInterpreter.h
@@ -367,9 +367,8 @@ public:
const char *ProcessEmbeddedScriptCommands(const char *arg);
void UpdatePrompt(llvm::StringRef prompt);
- void UpdatePrompt(const char *) = delete;
- bool Confirm(const char *message, bool default_answer);
+ bool Confirm(llvm::StringRef message, bool default_answer);
void LoadCommandDictionary();
diff --git a/lldb/source/Core/IOHandler.cpp b/lldb/source/Core/IOHandler.cpp
index 39fdd13e32a..315d20ed24b 100644
--- a/lldb/source/Core/IOHandler.cpp
+++ b/lldb/source/Core/IOHandler.cpp
@@ -127,7 +127,7 @@ void IOHandlerStack::PrintAsync(Stream *stream, const char *s, size_t len) {
}
}
-IOHandlerConfirm::IOHandlerConfirm(Debugger &debugger, const char *prompt,
+IOHandlerConfirm::IOHandlerConfirm(Debugger &debugger, llvm::StringRef prompt,
bool default_response)
: IOHandlerEditline(
debugger, IOHandler::Type::Confirm,
diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp
index 89ef7fe7760..2243316232b 100644
--- a/lldb/source/Interpreter/CommandInterpreter.cpp
+++ b/lldb/source/Interpreter/CommandInterpreter.cpp
@@ -1896,7 +1896,7 @@ void CommandInterpreter::UpdatePrompt(llvm::StringRef new_prompt) {
m_command_io_handler_sp->SetPrompt(new_prompt);
}
-bool CommandInterpreter::Confirm(const char *message, bool default_answer) {
+bool CommandInterpreter::Confirm(llvm::StringRef message, bool default_answer) {
// Check AutoConfirm first:
if (m_debugger.GetAutoConfirm())
return default_answer;
OpenPOWER on IntegriCloud