[Lldb-commits] [lldb] r294221 - Fix darwin build (llvm::once_flag fallout)

Pavel Labath via lldb-commits lldb-commits at lists.llvm.org
Mon Feb 6 11:30:59 PST 2017


Author: labath
Date: Mon Feb  6 13:30:59 2017
New Revision: 294221

URL: http://llvm.org/viewvc/llvm-project?rev=294221&view=rev
Log:
Fix darwin build (llvm::once_flag fallout)

Modified:
    lldb/trunk/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp
    lldb/trunk/tools/debugserver/source/MacOSX/DarwinLog/DarwinLogCollector.cpp

Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp?rev=294221&r1=294220&r2=294221&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp Mon Feb  6 13:30:59 2017
@@ -24,6 +24,7 @@
 #include "lldb/Utility/LLDBAssert.h"
 #include "lldb/Utility/PseudoTerminal.h"
 #include "lldb/Utility/StreamString.h"
+#include "llvm/Support/Threading.h"
 
 using namespace lldb;
 using namespace lldb_private;

Modified: lldb/trunk/tools/debugserver/source/MacOSX/DarwinLog/DarwinLogCollector.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/DarwinLog/DarwinLogCollector.cpp?rev=294221&r1=294220&r2=294221&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/DarwinLog/DarwinLogCollector.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/DarwinLog/DarwinLogCollector.cpp Mon Feb  6 13:30:59 2017
@@ -46,10 +46,10 @@ static os_activity_stream_set_event_hand
     s_os_activity_stream_set_event_handler;
 
 bool LookupSPICalls() {
-  static llvm::once_flag s_once_flag;
+  static std::once_flag s_once_flag;
   static bool s_has_spi;
 
-  llvm::call_once(s_once_flag, [] {
+  std::call_once(s_once_flag, [] {
     dlopen ("/System/Library/PrivateFrameworks/LoggingSupport.framework/LoggingSupport", RTLD_NOW);
     s_os_activity_stream_for_pid = (os_activity_stream_for_pid_t)dlsym(
         RTLD_DEFAULT, "os_activity_stream_for_pid");




More information about the lldb-commits mailing list