Add std::tm formatter, fix spdlog::stopwatch formatter, conditionally use fmt::runtime in test_errors

1 files changed, 9 insertions, 2 deletions

diff --git a/include/spdlog/stopwatch.h b/include/spdlog/stopwatch.h
index bb976b19..52b4b6ad 100644
--- a/include/spdlog/stopwatch.h
+++ b/include/spdlog/stopwatch.h
@@ -48,7 +48,14 @@ public:
 } // namespace spdlog
 
 // Support for fmt formatting  (e.g. "{:012.9}" or just "{}")
-namespace fmt {
+namespace
+#ifdef SPDLOG_USE_STD_FORMAT
+    std
+#else
+    fmt
+#endif
+{
+
 template<>
 struct formatter<spdlog::stopwatch> : formatter<double>
 {
@@ -58,4 +65,4 @@ struct formatter<spdlog::stopwatch> : formatter<double>
         return formatter<double>::format(sw.elapsed().count(), ctx);
     }
 };
-} // namespace fmt
+} // namespace fmt/std