[Lldb-commits] [lldb] r294743 - Fix darwin and windows builds broken by r294736

Pavel Labath via lldb-commits lldb-commits at lists.llvm.org
Fri Feb 10 04:32:44 PST 2017


Author: labath
Date: Fri Feb 10 06:32:43 2017
New Revision: 294743

URL: http://llvm.org/viewvc/llvm-project?rev=294743&view=rev
Log:
Fix darwin and windows builds broken by r294736

Update the platform-specific log classes to match the new interface.

Modified:
    lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp
    lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h
    lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindowsLog.cpp
    lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindowsLog.h

Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp?rev=294743&r1=294742&r2=294743&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp (original)
+++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp Fri Feb 10 06:32:43 2017
@@ -90,8 +90,9 @@ void ProcessKDPLog::DisableLog(const cha
   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.

Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h?rev=294743&r1=294742&r2=294743&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h (original)
+++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h Fri Feb 10 06:32:43 2017
@@ -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);
 

Modified: lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindowsLog.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindowsLog.cpp?rev=294743&r1=294742&r2=294743&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindowsLog.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindowsLog.cpp Fri Feb 10 06:32:43 2017
@@ -109,8 +109,9 @@ void ProcessWindowsLog::DisableLog(const
   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.

Modified: lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindowsLog.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindowsLog.h?rev=294743&r1=294742&r2=294743&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindowsLog.h (original)
+++ lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindowsLog.h Fri Feb 10 06:32:43 2017
@@ -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);
 };




More information about the lldb-commits mailing list