Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions include/iris/config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions include/iris/rvariant/rvariant_io.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ struct variant_format_for_impl<charT, rvariant<Ts...>>
using spec_type = variant_format_string_t<charT, Ts...>;

template<class... Fmts>
[[nodiscard]] static IRIS_CONSTEXPR_UP spec_type
[[nodiscard]] static consteval spec_type
apply(Fmts&&... fmts) noexcept
{
return variant_format_string{variant_format_string_overload<charT, Ts>{
Expand All @@ -142,7 +142,7 @@ struct variant_format_for_impl<charT, rvariant<Ts...>>


template<class... Ts, class... Fmts, class charT = select_char_t<Fmts...>>
[[nodiscard]] IRIS_CONSTEXPR_UP detail::variant_format_string_t<charT, Ts...>
[[nodiscard]] consteval detail::variant_format_string_t<charT, Ts...>
variant_format(Fmts&&... fmts) noexcept
{
static_assert(sizeof...(Ts) > 0);
Expand All @@ -152,7 +152,7 @@ variant_format(Fmts&&... fmts) noexcept
}

template<class Variant, class... Fmts, class charT = select_char_t<Fmts...>>
[[nodiscard]] IRIS_CONSTEXPR_UP detail::variant_format_for_impl<charT, std::remove_cvref_t<Variant>>::spec_type
[[nodiscard]] consteval detail::variant_format_for_impl<charT, std::remove_cvref_t<Variant>>::spec_type
variant_format_for(Fmts&&... fmts) noexcept
{
static_assert(is_ttp_specialization_of_v<std::remove_cvref_t<Variant>, rvariant>);
Expand Down
Loading