CI

Author: huixie90

libcxx/include/__flat_map/key_value_iterator.h

@@ -174,12 +174,12 @@ template <class _Owner, class _KeyContainer, class _MappedContainer, bool _Const
 struct __product_iterator_traits<__key_value_iterator<_Owner, _KeyContainer, _MappedContainer, _Const>> {
   static constexpr size_t __size = 2;
 
-  template <size_t _N>
+  template <size_t _Nth>
   _LIBCPP_HIDE_FROM_ABI static auto
   __get_iterator_element(__key_value_iterator<_Owner, _KeyContainer, _MappedContainer, _Const> __it)
-    requires(_N == 0 || _N == 1)
+    requires(_Nth <= 1)
   {
-    if constexpr (_N == 0) {
+    if constexpr (_Nth == 0) {
       return __it.__key_iter_;
     } else {
       return __it.__mapped_iter_;

libcxx/include/__iterator/product_iterator.h

@@ -28,6 +28,7 @@
 #include <__cstddef/size_t.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/integral_constant.h>
+#include <__utility/declval.h>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
@@ -56,12 +57,12 @@ template <class _Tp, size_t _Size, class = void>
 struct __is_product_iterator_of_size : false_type {};
 
 template <class _Tp, size_t _Size>
-struct __is_product_iterator_of_size<_Tp, _Size, __enable_if_t<__product_iterator_traits<_Tp>::__size == _Size>>
+struct __is_product_iterator_of_size<_Tp, _Size, __enable_if_t<__product_iterator_traits<_Tp>::__size == _Size> >
     : true_type {};
 
-template <class _Iterator, size_t _N>
-using __product_iterator_element_t =
-    decltype(__product_iterator_traits<_Iterator>::__get_iterator_element<_N>(declval<_Iterator>()));
+template <class _Iterator, size_t _Nth>
+using __product_iterator_element_t _LIBCPP_NODEBUG =
+    decltype(__product_iterator_traits<_Iterator>::__get_iterator_element<_Nth>(std::declval<_Iterator>()));
 
 _LIBCPP_END_NAMESPACE_STD
 

libcxx/include/__ranges/zip_view.h

@@ -478,10 +478,10 @@ template <class _Iter>
 struct __product_iterator_traits<_Iter> {
   static constexpr size_t __size = tuple_size<decltype(std::declval<_Iter>().__current_)>::value;
 
-  template <size_t _N>
-    requires(_N < __size)
+  template <size_t _Nth>
+    requires(_Nth < __size)
   _LIBCPP_HIDE_FROM_ABI static constexpr auto __get_iterator_element(_Iter __it) {
-    return std::get<_N>(__it.__current_);
+    return std::get<_Nth>(__it.__current_);
   }
 };