[Lldb-commits] [lldb] r264449 - Fix now-ambiguous references to Error.
Lang Hames via lldb-commits
lldb-commits at lists.llvm.org
Fri Mar 25 12:27:25 PDT 2016
Author: lhames
Date: Fri Mar 25 14:27:24 2016
New Revision: 264449
URL: http://llvm.org/viewvc/llvm-project?rev=264449&view=rev
Log:
Fix now-ambiguous references to Error.
Modified:
lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
Modified: lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp?rev=264449&r1=264448&r2=264449&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp (original)
+++ lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp Fri Mar 25 14:27:24 2016
@@ -793,7 +793,7 @@ static bool FindFunctionInModule (ConstS
return false;
}
-Error
+lldb_private::Error
ClangExpressionParser::PrepareForExecution (lldb::addr_t &func_addr,
lldb::addr_t &func_end,
lldb::IRExecutionUnitSP &execution_unit_sp,
@@ -805,7 +805,7 @@ ClangExpressionParser::PrepareForExecuti
func_end = LLDB_INVALID_ADDRESS;
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
- Error err;
+ lldb_private::Error err;
std::unique_ptr<llvm::Module> llvm_module_ap (m_code_generator->ReleaseModule());
@@ -872,7 +872,7 @@ ClangExpressionParser::PrepareForExecuti
if (execution_policy != eExecutionPolicyAlways && execution_policy != eExecutionPolicyTopLevel)
{
- Error interpret_error;
+ lldb_private::Error interpret_error;
bool interpret_function_calls = !process ? false : process->CanInterpretFunctionCalls();
can_interpret =
@@ -957,11 +957,11 @@ ClangExpressionParser::PrepareForExecuti
return err;
}
-Error
+lldb_private::Error
ClangExpressionParser::RunStaticInitializers (lldb::IRExecutionUnitSP &execution_unit_sp,
ExecutionContext &exe_ctx)
{
- Error err;
+ lldb_private::Error err;
lldbassert(execution_unit_sp.get());
lldbassert(exe_ctx.HasThreadScope());
More information about the lldb-commits
mailing list