aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2016-01-16 17:22:30 +0000
committerDimitry Andric <dim@FreeBSD.org>2016-01-16 17:22:30 +0000
commit3fb4ff8c1b2912f62d1dc33fb10d73599339802a (patch)
tree2261193bb07ac0e3880bbd6620741a7fb6c6a447
parent7fed546d1996271dabc7cf71d4d033125c4da4ee (diff)
downloadsrc-vendor/lldb/lldb-release_38-r257836.tar.gz
src-vendor/lldb/lldb-release_38-r257836.zip
Vendor import of lldb release_38 branch r257836:vendor/lldb/lldb-release_38-r257836
-rw-r--r--include/lldb/Target/ThreadPlanCallFunctionUsingABI.h2
-rw-r--r--source/API/SBProcess.cpp3
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<void*>(event.get()), ret_val);
return ret_val;
}