[Lldb-commits] [lldb] r251109 - Try to fix MSVC build after r251105

[Tamas Berghammer via lldb-commits]

Author: tberghammer
Date: Fri Oct 23 05:53:31 2015
New Revision: 251109

URL: http://llvm.org/viewvc/llvm-project?rev=251109&view=rev
Log:
Try to fix MSVC build after r251105

Modified:
    lldb/trunk/include/lldb/Core/Timer.h
    lldb/trunk/source/Core/Timer.cpp

Modified: lldb/trunk/include/lldb/Core/Timer.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Timer.h?rev=251109&r1=251108&r2=251109&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Timer.h (original)
+++ lldb/trunk/include/lldb/Core/Timer.h Fri Oct 23 05:53:31 2015
@@ -13,8 +13,11 @@
 
 #include <stdarg.h>
 #include <stdio.h>
-#include <string>
+
+#include <atomic>
 #include <mutex>
+#include <string>
+
 #include "lldb/lldb-private.h"
 #include "lldb/Host/TimeValue.h"
 
@@ -86,8 +89,8 @@ protected:
     uint64_t m_total_ticks; // Total running time for this timer including when other timers below this are running
     uint64_t m_timer_ticks; // Ticks for this timer that do not include when other timers below this one are running
 
-    static std::atomic_bool g_quiet;
-    static std::atomic_uint g_display_depth;
+    static std::atomic<bool> g_quiet;
+    static std::atomic<unsigned> g_display_depth;
     static std::mutex g_file_mutex;
     static FILE* g_file;
 

Modified: lldb/trunk/source/Core/Timer.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Timer.cpp?rev=251109&r1=251108&r2=251109&view=diff
==============================================================================
--- lldb/trunk/source/Core/Timer.cpp (original)
+++ lldb/trunk/source/Core/Timer.cpp Fri Oct 23 05:53:31 2015
@@ -37,8 +37,8 @@ namespace
     };
 } // end of anonymous namespace
 
-std::atomic_bool Timer::g_quiet(true);
-std::atomic_uint Timer::g_display_depth(0);
+std::atomic<bool> Timer::g_quiet(true);
+std::atomic<unsigned> Timer::g_display_depth(0);
 std::mutex Timer::g_file_mutex;
 FILE* Timer::g_file = nullptr;