From a537c39fdffd5c225b855e2c75f996033ae37a80 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Sat, 23 Dec 2023 14:35:11 -0800 Subject: [PATCH] Move conjunction to where it is used --- include/fmt/format.h | 7 ------- include/fmt/ranges.h | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/fmt/format.h b/include/fmt/format.h index d5010a40..15045b9e 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -277,13 +277,6 @@ FMT_END_NAMESPACE #endif FMT_BEGIN_NAMESPACE - -template struct conjunction : std::true_type {}; -template struct conjunction

: P {}; -template -struct conjunction - : conditional_t, P1> {}; - namespace detail { FMT_CONSTEXPR inline void abort_fuzzing_if(bool condition) { diff --git a/include/fmt/ranges.h b/include/fmt/ranges.h index 43f89d00..3638fffb 100644 --- a/include/fmt/ranges.h +++ b/include/fmt/ranges.h @@ -417,6 +417,12 @@ struct is_formattable_delayed #endif } // namespace detail +template struct conjunction : std::true_type {}; +template struct conjunction

: P {}; +template +struct conjunction + : conditional_t, P1> {}; + template struct range_formatter;