Commit 842e5236 authored by gabime's avatar gabime

Fixed possible name collision with boost chrono

parent b4923956
...@@ -214,9 +214,8 @@ protected: ...@@ -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: ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment