summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2017-02-10 12:32:43 +0000
committerPavel Labath <labath@google.com>2017-02-10 12:32:43 +0000
commitedfbda49843a6a658b5c7d2ada860c53fe2e593d (patch)
tree227dbad60d115b66263afb86aaf9418a5dde3c9e
parent5f7e583b33759eab244e0e1a29a4e5ebb778d6a8 (diff)
downloadbcm5719-llvm-edfbda49843a6a658b5c7d2ada860c53fe2e593d.tar.gz
bcm5719-llvm-edfbda49843a6a658b5c7d2ada860c53fe2e593d.zip
Fix darwin and windows builds broken by r294736
Update the platform-specific log classes to match the new interface. llvm-svn: 294743
-rw-r--r--lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp5
-rw-r--r--lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h8
-rw-r--r--lldb/source/Plugins/Process/Windows/Common/ProcessWindowsLog.cpp5
-rw-r--r--lldb/source/Plugins/Process/Windows/Common/ProcessWindowsLog.h7
4 files changed, 14 insertions, 11 deletions
diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp
index 74f45059561..7dc10804b8e 100644
--- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp
+++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp
@@ -90,8 +90,9 @@ void ProcessKDPLog::DisableLog(const char **categories, Stream *feedback_strm) {
return;
}
-Log *ProcessKDPLog::EnableLog(StreamSP &log_stream_sp, uint32_t log_options,
- const char **categories, Stream *feedback_strm) {
+Log *ProcessKDPLog::EnableLog(
+ const std::shared_ptr<llvm::raw_ostream> &log_stream_sp,
+ uint32_t log_options, const char **categories, Stream *feedback_strm) {
// Try see if there already is a log - that way we can reuse its settings.
// We could reuse the log in toto, but we don't know that the stream is the
// same.
diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h
index 4408b145951..9d8b55f2c69 100644
--- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h
+++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h
@@ -39,10 +39,10 @@ public:
static void DisableLog(const char **categories,
lldb_private::Stream *feedback_strm);
- static lldb_private::Log *EnableLog(lldb::StreamSP &log_stream_sp,
- uint32_t log_options,
- const char **categories,
- lldb_private::Stream *feedback_strm);
+ static lldb_private::Log *
+ EnableLog(const std::shared_ptr<llvm::raw_ostream> &log_stream_sp,
+ uint32_t log_options, const char **categories,
+ lldb_private::Stream *feedback_strm);
static void ListLogCategories(lldb_private::Stream *strm);
diff --git a/lldb/source/Plugins/Process/Windows/Common/ProcessWindowsLog.cpp b/lldb/source/Plugins/Process/Windows/Common/ProcessWindowsLog.cpp
index 3434808e94e..7cd52e4af34 100644
--- a/lldb/source/Plugins/Process/Windows/Common/ProcessWindowsLog.cpp
+++ b/lldb/source/Plugins/Process/Windows/Common/ProcessWindowsLog.cpp
@@ -109,8 +109,9 @@ void ProcessWindowsLog::DisableLog(const char **args, Stream *feedback_strm) {
return;
}
-Log *ProcessWindowsLog::EnableLog(StreamSP &log_stream_sp, uint32_t log_options,
- const char **args, Stream *feedback_strm) {
+Log *ProcessWindowsLog::EnableLog(
+ std::shared_ptr<llvm::raw_ostream> &log_stream_sp, uint32_t log_options,
+ const char **args, Stream *feedback_strm) {
// Try see if there already is a log - that way we can reuse its settings.
// We could reuse the log in toto, but we don't know that the stream is the
// same.
diff --git a/lldb/source/Plugins/Process/Windows/Common/ProcessWindowsLog.h b/lldb/source/Plugins/Process/Windows/Common/ProcessWindowsLog.h
index cbb99e8d907..8de35611edf 100644
--- a/lldb/source/Plugins/Process/Windows/Common/ProcessWindowsLog.h
+++ b/lldb/source/Plugins/Process/Windows/Common/ProcessWindowsLog.h
@@ -51,9 +51,10 @@ public:
static void DisableLog(const char **args,
lldb_private::Stream *feedback_strm);
- static lldb_private::Log *EnableLog(lldb::StreamSP &log_stream_sp,
- uint32_t log_options, const char **args,
- lldb_private::Stream *feedback_strm);
+ static lldb_private::Log *
+ EnableLog(const std::shared_ptr<llvm::raw_ostream> &log_stream_sp,
+ uint32_t log_options, const char **args,
+ lldb_private::Stream *feedback_strm);
static void ListLogCategories(lldb_private::Stream *strm);
};
OpenPOWER on IntegriCloud