gitMirror/spdlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed possible name collision with boost chrono

Browse Source
This commit is contained in:
gabime
2016-07-15 17:58:09 +03:00
parent b4923956ce
commit 842e5236e4
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/spdlog/sinks/file_sinks.h
View File

@@ -214,9 +214,8 @@ protected:
private: private:
std::chrono::system_clock::time_point _next_rotation_tp() std::chrono::system_clock::time_point _next_rotation_tp()
{ {
using namespace std::chrono; auto now = std::chrono::system_clock::now();
auto now = system_clock::now();
time_t tnow = std::chrono::system_clock::to_time_t(now); time_t tnow = std::chrono::system_clock::to_time_t(now);
tm date = spdlog::details::os::localtime(tnow); tm date = spdlog::details::os::localtime(tnow);
date.tm_hour = _rotation_h; date.tm_hour = _rotation_h;
@@ -226,7 +225,7 @@ private:
if (rotation_time > now) if (rotation_time > now)
return rotation_time; return rotation_time;
else else
return system_clock::time_point(rotation_time + hours(24)); return std::chrono::system_clock::time_point(rotation_time + std::chrono::hours(24));
} }
filename_t _base_filename; filename_t _base_filename;