From 3fb4ff8c1b2912f62d1dc33fb10d73599339802a Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 16 Jan 2016 17:22:30 +0000 Subject: Vendor import of lldb release_38 branch r257836: https://llvm.org/svn/llvm-project/lldb/branches/release_38@257836 --- include/lldb/Target/ThreadPlanCallFunctionUsingABI.h | 2 +- source/API/SBProcess.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h b/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h index 529057175287..3506ebab6ce0 100644 --- a/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h +++ b/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h @@ -20,7 +20,7 @@ #include "lldb/Target/ThreadPlanCallFunction.h" #include "llvm/ADT/ArrayRef.h" -#include "llvm/IR/Type.h" +#include "llvm/IR/DerivedTypes.h" namespace lldb_private { diff --git a/source/API/SBProcess.cpp b/source/API/SBProcess.cpp index 42554726c018..eea5fdca2b38 100644 --- a/source/API/SBProcess.cpp +++ b/source/API/SBProcess.cpp @@ -1000,7 +1000,8 @@ SBProcess::GetRestartedFromEvent (const SBEvent &event) bool ret_val = Process::ProcessEventData::GetRestartedFromEvent (event.get()); if (log) - log->Printf ("SBProcess::%s (event.sp=%p) => %d", __FUNCTION__, event.get(), ret_val); + log->Printf ("SBProcess::%s (event.sp=%p) => %d", __FUNCTION__, + static_cast(event.get()), ret_val); return ret_val; } -- cgit v1.3