From 2c854cc8b758785b0079406f54cce8d017ed12ad Mon Sep 17 00:00:00 2001
From: gabime <gmelman1@gmail.com>
Date: Wed, 3 Dec 2014 01:15:25 +0200
Subject: [PATCH] fixed gcc shadow warnings

---
 include/spdlog/details/async_log_helper.h |  8 ++++----
 include/spdlog/details/mpcs_q.h           | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/spdlog/details/async_log_helper.h b/include/spdlog/details/async_log_helper.h
index 92c2f18d..094162de 100644
--- a/include/spdlog/details/async_log_helper.h
+++ b/include/spdlog/details/async_log_helper.h
@@ -87,7 +87,7 @@ class async_log_helper
 public:
 
     using q_type = details::mpsc_q < std::unique_ptr<async_msg> >;
-    using clock = std::chrono::monotonic_clock;
+    using clock = std::chrono::steady_clock;
 
 
     explicit async_log_helper(size_t max_queue_size);
@@ -175,16 +175,16 @@ inline void spdlog::details::async_log_helper::_thread_loop()
     clock::time_point last_pop = clock::now();
     while (_active)
     {
-        q_type::item_type async_msg;
+        q_type::item_type popped_msg;
 
-        if (_q.pop(async_msg))
+        if (_q.pop(popped_msg))
         {
 
             last_pop = clock::now();
 
             try
             {
-                details::log_msg log_msg = async_msg->to_log_msg();
+                details::log_msg log_msg = popped_msg->to_log_msg();
 
                 _formatter->format(log_msg);
                 for (auto &s : _sinks)
diff --git a/include/spdlog/details/mpcs_q.h b/include/spdlog/details/mpcs_q.h
index 77511db3..c994307b 100644
--- a/include/spdlog/details/mpcs_q.h
+++ b/include/spdlog/details/mpcs_q.h
@@ -89,11 +89,11 @@ public:
     }
 
     template<typename TT>
-    bool push(TT&& value)
+    bool push(TT&& val)
     {
         if (_size >= _max_size)
             return false;
-        mpscq_node_t* new_node = new mpscq_node_t(std::forward<TT>(value));
+        mpscq_node_t* new_node = new mpscq_node_t(std::forward<TT>(val));
         push_node(new_node);
         ++_size;
         return true;
@@ -143,13 +143,13 @@ private:
         mpscq_node_t(const mpscq_node_t&) = delete;
         mpscq_node_t& operator=(const mpscq_node_t&) = delete;
 
-        explicit mpscq_node_t(const T& value):
+        explicit mpscq_node_t(const T& val):
             next(nullptr),
-            value(value) {}
+            value(val) {}
 
-        explicit mpscq_node_t(T&& value) :
+        explicit mpscq_node_t(T&& val) :
             next(nullptr),
-            value(std::move(value)) {}
+            value(std::move(val)) {}
     };
 
     size_t _max_size;
@@ -201,4 +201,4 @@ private:
 
 };
 }
-}
\ No newline at end of file
+}