replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try to fix MSVC build after r251105 

llvm-svn: 251109
This commit is contained in:
Tamas Berghammer 2015-10-23 10:53:31 +00:00
parent 5b18b4ce96
commit 5ee6b7f4b2
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lldb/include/lldb/Core/Timer.h
View File

@ -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;

4
lldb/source/Core/Timer.cpp
View File

@ -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;