Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x

gabime · gabime · commit 22a169bc319a · 2020-05-27T00:02:51.000+03:00
diff --git a/include/spdlog/sinks/daily_file_sink.h b/include/spdlog/sinks/daily_file_sink.h
@@ -155,7 +155,7 @@ class daily_file_sink final : public base_sink<Mutex>
         using details::os::filename_to_str;
         using details::os::remove_if_exists;
 
-        filename_t current_file = filename();
+        filename_t current_file = file_helper_.filename();
         if (filenames_q_.full())
         {
             auto old_filename = std::move(filenames_q_.front());

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ class daily_file_sink final : public base_sink<Mutex>`
`155`	`155`	`using details::os::filename_to_str;`
`156`	`156`	`using details::os::remove_if_exists;`
`157`	`157`
`158`		`- filename_t current_file = filename();`
	`158`	`+ filename_t current_file = file_helper_.filename();`
`159`	`159`	`if (filenames_q_.full())`
`160`	`160`	`{`
`161`	`161`	`auto old_filename = std::move(filenames_q_.front());`