From: Christopher Di Bella <cjdb@google.com>
Date: Tue, 13 Apr 2021 05:15:10 +0000 (+0000)
Subject: [libcxx][NFC] tweaks `incrementable_traits` per review
X-Git-Tag: llvmorg-14-init~9794
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0fcea41920cef7414cd55f5fdb2f335f6d2ddb92;p=platform%2Fupstream%2Fllvm.git

[libcxx][NFC] tweaks `incrementable_traits` per review

One suggestion was missed and is being patched now.
---

diff --git a/libcxx/include/iterator b/libcxx/include/iterator
index c45a1e5..cddeb9a 100644
--- a/libcxx/include/iterator
+++ b/libcxx/include/iterator
@@ -461,12 +461,12 @@ struct incrementable_traits<_Tp> {
 
 template<class _Tp>
 concept __has_integral_minus =
-  !__has_member_difference_type<_Tp> &&
   requires(const _Tp& __x, const _Tp& __y) {
     { __x - __y } -> integral;
   };
 
 template<__has_integral_minus _Tp>
+requires (!__has_member_difference_type<_Tp>)
 struct incrementable_traits<_Tp> {
   using difference_type = make_signed_t<decltype(declval<_Tp>() - declval<_Tp>())>;
 };