Revert "OrcLib: Text: fmt: std_optional: enhance compatibility with s…

…td::decay_t" This reverts commit 6179e0600b581e139f6354dfa86f017a957dad96.
DFIR-ORC · Jun 4, 2024 · d1574d5 · d1574d5
1 parent 824c266
commit d1574d5
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/OrcLib/Text/Fmt/std_optional.h b/src/OrcLib/Text/Fmt/std_optional.h
@@ -13,33 +13,33 @@
 #include <fmt/format.h>
 
 template <typename T>
-struct fmt::formatter<std::optional<T>> : public fmt::formatter<std::decay_t<T>>
+struct fmt::formatter<std::optional<T>> : public fmt::formatter<T>
 {
     template <typename FormatContext>
-    auto format(const std::optional<T>& optional, FormatContext& ctx) const -> decltype(ctx.out())
+    auto format(const std::optional<T>& optional, FormatContext& ctx) -> decltype(ctx.out())
     {
         if (!optional.has_value())
         {
             formatter<std::string_view> na;
             return na.format("N/A", ctx);
         }
 
-        return formatter<std::decay_t<T>>::format(optional.value(), ctx);
+        return formatter<T>::format(optional.value(), ctx);
     }
 };
 
 template <typename T>
-struct fmt::formatter<std::optional<T>, wchar_t> : public fmt::formatter<std::decay_t<T>, wchar_t>
+struct fmt::formatter<std::optional<T>, wchar_t> : public fmt::formatter<T, wchar_t>
 {
     template <typename FormatContext>
-    auto format(const std::optional<T>& optional, FormatContext& ctx) const -> decltype(ctx.out())
+    auto format(const std::optional<T>& optional, FormatContext& ctx) -> decltype(ctx.out())
     {
         if (!optional.has_value())
         {
             formatter<std::wstring_view, wchar_t> na;
             return na.format(L"N/A", ctx);
         }
 
-        return formatter<std::decay_t<T>, wchar_t>::format(optional.value(), ctx);
+        return formatter<T, wchar_t>::format(optional.value(), ctx);
     }
 };