From b2c1dd400eb782ac926da667a76d266ec6b931dc Mon Sep 17 00:00:00 2001 From: Nana Sakisaka <1901813+saki7@users.noreply.github.com> Date: Sat, 14 Nov 2026 07:52:34 +0900 Subject: [PATCH] Fix rvariant formatter for MSVC --- include/iris/config.hpp | 7 ------- include/iris/rvariant/rvariant_io.hpp | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/include/iris/config.hpp b/include/iris/config.hpp index f64eb84..5b19d57 100644 --- a/include/iris/config.hpp +++ b/include/iris/config.hpp @@ -86,13 +86,6 @@ #endif -#if __cpp_consteval >= 202211L -# define IRIS_CONSTEXPR_UP constexpr -#else -# define IRIS_CONSTEXPR_UP consteval -#endif - - // TODO: // [[msvc::forceinline]] https://developercommunity.visualstudio.com/t/support-forceinline-on-c-lambda-expressions/351580#T-N1092115 // [[clang::always_inline]] https://clang.llvm.org/docs/AttributeReference.html#always-inline-force-inline diff --git a/include/iris/rvariant/rvariant_io.hpp b/include/iris/rvariant/rvariant_io.hpp index 63e457e..f6f42a0 100644 --- a/include/iris/rvariant/rvariant_io.hpp +++ b/include/iris/rvariant/rvariant_io.hpp @@ -129,7 +129,7 @@ struct variant_format_for_impl> using spec_type = variant_format_string_t; template - [[nodiscard]] static IRIS_CONSTEXPR_UP spec_type + [[nodiscard]] static consteval spec_type apply(Fmts&&... fmts) noexcept { return variant_format_string{variant_format_string_overload{ @@ -142,7 +142,7 @@ struct variant_format_for_impl> template> -[[nodiscard]] IRIS_CONSTEXPR_UP detail::variant_format_string_t +[[nodiscard]] consteval detail::variant_format_string_t variant_format(Fmts&&... fmts) noexcept { static_assert(sizeof...(Ts) > 0); @@ -152,7 +152,7 @@ variant_format(Fmts&&... fmts) noexcept } template> -[[nodiscard]] IRIS_CONSTEXPR_UP detail::variant_format_for_impl>::spec_type +[[nodiscard]] consteval detail::variant_format_for_impl>::spec_type variant_format_for(Fmts&&... fmts) noexcept { static_assert(is_ttp_specialization_of_v, rvariant>);