From 00149c0b6a0a0ec2ba9c7eefc342d13d21397219 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Fri, 21 May 2021 09:16:45 -0700 Subject: [PATCH] Move detail::null to chrono where it is used --- include/fmt/chrono.h | 1 + include/fmt/format.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/fmt/chrono.h b/include/fmt/chrono.h index e26e5190..39b5d33c 100644 --- a/include/fmt/chrono.h +++ b/include/fmt/chrono.h @@ -283,6 +283,7 @@ To safe_duration_cast(std::chrono::duration from, #define FMT_NOMACRO namespace detail { +template struct null {}; inline null<> localtime_r FMT_NOMACRO(...) { return null<>(); } inline null<> localtime_s(...) { return null<>(); } inline null<> gmtime_r(...) { return null<>(); } diff --git a/include/fmt/format.h b/include/fmt/format.h index 06f7ea12..bbaef4b0 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -1135,8 +1135,6 @@ class utf8_to_utf16 { std::wstring str() const { return {&buffer_[0], size()}; } }; -template struct null {}; - namespace dragonbox { // Type-specific information that Dragonbox uses.