From 27cc76766c7b1c5247bcf5e634a1459486f6d4cf Mon Sep 17 00:00:00 2001
From: gabime <gmelman1@gmail.com>
Date: Tue, 17 Sep 2019 12:01:15 +0300
Subject: [PATCH] Avoid un necessary move when popping circular_q

---
 include/spdlog/details/backtracer-inl.h | 2 +-
 include/spdlog/sinks/daily_file_sink.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/spdlog/details/backtracer-inl.h b/include/spdlog/details/backtracer-inl.h
index 5d6de81c..daf1ab33 100644
--- a/include/spdlog/details/backtracer-inl.h
+++ b/include/spdlog/details/backtracer-inl.h
@@ -66,8 +66,8 @@ SPDLOG_INLINE void backtracer::foreach_pop(std::function<void(const details::log
     while (!messages_.empty())
     {
         auto &front_msg = messages_.front();
-        messages_.pop_front();
         fun(front_msg);
+        messages_.pop_front();
     }
 }
 } // namespace details
diff --git a/include/spdlog/sinks/daily_file_sink.h b/include/spdlog/sinks/daily_file_sink.h
index 59cf52d4..8514f615 100644
--- a/include/spdlog/sinks/daily_file_sink.h
+++ b/include/spdlog/sinks/daily_file_sink.h
@@ -139,7 +139,7 @@ private:
         filename_t current_file = filename();
         if (filenames_q_.full())
         {
-            auto &old_filename = filenames_q_.front();
+            auto old_filename = std::move(filenames_q_.front());
             filenames_q_.pop_front();
             bool ok = remove_if_exists(old_filename) == 0;
             if (!ok)