constexpr fix

huixie90 · huixie90 · commit 6b57b90ef6cc · 2025-06-21T20:47:40.000+01:00
diff --git a/libcxx/include/__flat_map/key_value_iterator.h b/libcxx/include/__flat_map/key_value_iterator.h
@@ -191,7 +191,7 @@ struct __product_iterator_traits<__key_value_iterator<_Owner, _KeyContainer, _Ma
   static constexpr size_t __size = 2;
 
   template <size_t _Nth, class _Iter>
-  _LIBCPP_HIDE_FROM_ABI static decltype(auto) __get_iterator_element(_Iter&& __it)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static decltype(auto) __get_iterator_element(_Iter&& __it)
     requires(_Nth <= 1)
   {
     if constexpr (_Nth == 0) {
@@ -202,7 +202,8 @@ struct __product_iterator_traits<__key_value_iterator<_Owner, _KeyContainer, _Ma
   }
 
   template <class _KeyIter, class _MappedIter>
-  _LIBCPP_HIDE_FROM_ABI static auto __make_product_iterator(_KeyIter&& __key_iter, _MappedIter&& __mapped_iter) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static auto
+  __make_product_iterator(_KeyIter&& __key_iter, _MappedIter&& __mapped_iter) {
     return __key_value_iterator<_Owner, _KeyContainer, _MappedContainer, _Const>(
         std::forward<_KeyIter>(__key_iter), std::forward<_MappedIter>(__mapped_iter));
   }

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ struct __product_iterator_traits<__key_value_iterator<_Owner, _KeyContainer, _Ma`
`191`	`191`	`static constexpr size_t __size = 2;`
`192`	`192`
`193`	`193`	`template <size_t _Nth, class _Iter>`
`194`		`- _LIBCPP_HIDE_FROM_ABI static decltype(auto) __get_iterator_element(_Iter&& __it)`
	`194`	`+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static decltype(auto) __get_iterator_element(_Iter&& __it)`
`195`	`195`	`requires(_Nth <= 1)`
`196`	`196`	`{`
`197`	`197`	`if constexpr (_Nth == 0) {`
`@@ -202,7 +202,8 @@ struct __product_iterator_traits<__key_value_iterator<_Owner, _KeyContainer, _Ma`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`template <class _KeyIter, class _MappedIter>`
`205`		`- _LIBCPP_HIDE_FROM_ABI static auto __make_product_iterator(_KeyIter&& __key_iter, _MappedIter&& __mapped_iter) {`
	`205`	`+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static auto`
	`206`	`+ __make_product_iterator(_KeyIter&& __key_iter, _MappedIter&& __mapped_iter) {`
`206`	`207`	`return __key_value_iterator<_Owner, _KeyContainer, _MappedContainer, _Const>(`
`207`	`208`	`std::forward<_KeyIter>(__key_iter), std::forward<_MappedIter>(__mapped_iter));`
`208`	`209`	`}`