Author: James Y Knight Date: 2024-06-26T23:57:04-04:00 New Revision: 379cd1193a8453850f0c2e12c005160d7535b373
URL: https://github.com/llvm/llvm-project/commit/379cd1193a8453850f0c2e12c005160d7535b373 DIFF: https://github.com/llvm/llvm-project/commit/379cd1193a8453850f0c2e12c005160d7535b373.diff LOG: Revert "[libc++] Use _If for conditional_t (#96193)" This reverts commit 2274c66e6faaaf29ad693b1ae3e5a7b0228a1950. Added: Modified: libcxx/include/__type_traits/conditional.h Removed: ################################################################################ diff --git a/libcxx/include/__type_traits/conditional.h b/libcxx/include/__type_traits/conditional.h index 7d5849ee824e3..5b5445a837427 100644 --- a/libcxx/include/__type_traits/conditional.h +++ b/libcxx/include/__type_traits/conditional.h @@ -44,14 +44,15 @@ struct _LIBCPP_TEMPLATE_VIS conditional<false, _If, _Then> { using type _LIBCPP_NODEBUG = _Then; }; -template <bool _Bp, class _IfRes, class _ElseRes> -using __conditional_t _LIBCPP_NODEBUG = _If<_Bp, _IfRes, _ElseRes>; - #if _LIBCPP_STD_VER >= 14 template <bool _Bp, class _IfRes, class _ElseRes> -using conditional_t _LIBCPP_NODEBUG = __conditional_t<_Bp, _IfRes, _ElseRes>; +using conditional_t _LIBCPP_NODEBUG = typename conditional<_Bp, _IfRes, _ElseRes>::type; #endif +// Helper so we can use "conditional_t" in all language versions. +template <bool _Bp, class _If, class _Then> +using __conditional_t _LIBCPP_NODEBUG = typename conditional<_Bp, _If, _Then>::type; + _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP___TYPE_TRAITS_CONDITIONAL_H _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
