From b76161e41bc2c07cd47f9c61f875d1be95e26d10 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Tue, 16 May 2017 19:47:58 +0000 Subject: Vendor import of lldb trunk r303197: https://llvm.org/svn/llvm-project/lldb/trunk@303197 --- source/Interpreter/OptionValueArray.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'source/Interpreter/OptionValueArray.cpp') diff --git a/source/Interpreter/OptionValueArray.cpp b/source/Interpreter/OptionValueArray.cpp index 0d1825cec28b..8b62070352a6 100644 --- a/source/Interpreter/OptionValueArray.cpp +++ b/source/Interpreter/OptionValueArray.cpp @@ -70,18 +70,19 @@ void OptionValueArray::DumpValue(const ExecutionContext *exe_ctx, Stream &strm, } } -Error OptionValueArray::SetValueFromString(llvm::StringRef value, - VarSetOperationType op) { +Status OptionValueArray::SetValueFromString(llvm::StringRef value, + VarSetOperationType op) { Args args(value.str()); - Error error = SetArgs(args, op); + Status error = SetArgs(args, op); if (error.Success()) NotifyValueChanged(); return error; } lldb::OptionValueSP -OptionValueArray::GetSubValue(const ExecutionContext *exe_ctx, llvm::StringRef name, - bool will_modify, Error &error) const { +OptionValueArray::GetSubValue(const ExecutionContext *exe_ctx, + llvm::StringRef name, bool will_modify, + Status &error) const { if (name.empty() || name.front() != '[') { error.SetErrorStringWithFormat( "invalid value path '%s', %s values only support '[]' subvalues " @@ -149,8 +150,8 @@ size_t OptionValueArray::GetArgs(Args &args) const { return args.GetArgumentCount(); } -Error OptionValueArray::SetArgs(const Args &args, VarSetOperationType op) { - Error error; +Status OptionValueArray::SetArgs(const Args &args, VarSetOperationType op) { + Status error; const size_t argc = args.GetArgumentCount(); switch (op) { case eVarSetOperationInvalid: -- cgit v1.3