Merge branch 'master' of https://github.com/gabime/spdlog

2014-11-07 16:22:29 +02:00
parent baec3ec1fb 49c01c2022
commit b599609dbf
1 changed files with 1 additions and 1 deletions
--- a/include/spdlog/details/pattern_formatter_impl.h
+++ b/include/spdlog/details/pattern_formatter_impl.h
@@ -305,7 +305,7 @@ public:
        std::lock_guard<std::mutex> l(_mutex);
        using namespace std::chrono;
        auto diff = msg.time - _last_update;
-        auto secs_diff = abs((duration_cast<seconds>(diff)).count());
+        auto secs_diff = std::abs((duration_cast<seconds>(diff)).count());
        if (secs_diff >= 2)
        {
            _value = get_value(msg);