Skip to content

Commit d1574d5

Browse files
committedJun 4, 2024
Revert "OrcLib: Text: fmt: std_optional: enhance compatibility with std::decay_t"
This reverts commit 6179e0600b581e139f6354dfa86f017a957dad96.
1 parent 824c266 commit d1574d5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed
 

‎src/OrcLib/Text/Fmt/std_optional.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,33 @@
1313
#include <fmt/format.h>
1414

1515
template <typename T>
16-
struct fmt::formatter<std::optional<T>> : public fmt::formatter<std::decay_t<T>>
16+
struct fmt::formatter<std::optional<T>> : public fmt::formatter<T>
1717
{
1818
template <typename FormatContext>
19-
auto format(const std::optional<T>& optional, FormatContext& ctx) const -> decltype(ctx.out())
19+
auto format(const std::optional<T>& optional, FormatContext& ctx) -> decltype(ctx.out())
2020
{
2121
if (!optional.has_value())
2222
{
2323
formatter<std::string_view> na;
2424
return na.format("N/A", ctx);
2525
}
2626

27-
return formatter<std::decay_t<T>>::format(optional.value(), ctx);
27+
return formatter<T>::format(optional.value(), ctx);
2828
}
2929
};
3030

3131
template <typename T>
32-
struct fmt::formatter<std::optional<T>, wchar_t> : public fmt::formatter<std::decay_t<T>, wchar_t>
32+
struct fmt::formatter<std::optional<T>, wchar_t> : public fmt::formatter<T, wchar_t>
3333
{
3434
template <typename FormatContext>
35-
auto format(const std::optional<T>& optional, FormatContext& ctx) const -> decltype(ctx.out())
35+
auto format(const std::optional<T>& optional, FormatContext& ctx) -> decltype(ctx.out())
3636
{
3737
if (!optional.has_value())
3838
{
3939
formatter<std::wstring_view, wchar_t> na;
4040
return na.format(L"N/A", ctx);
4141
}
4242

43-
return formatter<std::decay_t<T>, wchar_t>::format(optional.value(), ctx);
43+
return formatter<T, wchar_t>::format(optional.value(), ctx);
4444
}
4545
};

0 commit comments

Comments
 (0)
Please sign in to comment.