Merge "Run git-clang-format on log.{h,cpp}" into sc-dev
This commit is contained in:
@@ -43,6 +43,7 @@ class LogBuffer {
|
|||||||
static const int MAX_CAPACITY = 100;
|
static const int MAX_CAPACITY = 100;
|
||||||
void addLog(const LogMessage& log);
|
void addLog(const LogMessage& log);
|
||||||
std::vector<LogMessage> getLogs();
|
std::vector<LogMessage> getLogs();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::deque<LogMessage> buffer_;
|
std::deque<LogMessage> buffer_;
|
||||||
std::mutex mutex_;
|
std::mutex mutex_;
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ int64_t GetCurrentTimeMs() {
|
|||||||
auto msec2 = static_cast<int64_t>(tv.tv_usec) / 1000;
|
auto msec2 = static_cast<int64_t>(tv.tv_usec) / 1000;
|
||||||
return msec1 + msec2;
|
return msec1 + msec2;
|
||||||
}
|
}
|
||||||
}
|
} // namespace
|
||||||
|
|
||||||
LogPriority g_cutoff = LOG_VERBOSE;
|
LogPriority g_cutoff = LOG_VERBOSE;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user