Wrap around c++26 macro and test fix

rsaddatimov · rsaddatimov · commit 15fa9ec69f52 · 2025-10-26T18:11:57.000+03:00
diff --git a/libcxx/include/__chrono/day.h b/libcxx/include/__chrono/day.h
@@ -93,13 +93,17 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr day& day::operator-=(const days& __dd) no
 
 } // namespace chrono
 
+#  if _LIBCPP_STD_VER >= 26
+
 template <>
 struct hash<chrono::day> : public __unary_function<chrono::day, size_t> {
   _LIBCPP_HIDE_FROM_ABI size_t operator()(const chrono::day& __d) const _NOEXCEPT {
     return hash<unsigned>{}(static_cast<unsigned>(__d));
   }
 };
 
+#  endif // _LIBCPP_STD_VER >= 26
+
 _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
diff --git a/libcxx/include/__chrono/duration.h b/libcxx/include/__chrono/duration.h
@@ -539,7 +539,7 @@ using namespace literals::chrono_literals;
 
 #endif // _LIBCPP_STD_VER >= 14
 
-#if _LIBCPP_STD_VER >= 20
+#if _LIBCPP_STD_VER >= 26
 
 template <class _Rep, class _Period>
   requires __has_enabled_hash<_Rep>::value
@@ -549,7 +549,7 @@ struct hash<chrono::duration<_Rep, _Period>> : public __unary_function<chrono::d
   }
 };
 
-#endif // _LIBCPP_STD_VER >= 20
+#endif // _LIBCPP_STD_VER >= 26
 
 _LIBCPP_END_NAMESPACE_STD
 
diff --git a/libcxx/include/__chrono/leap_second.h b/libcxx/include/__chrono/leap_second.h
@@ -123,13 +123,17 @@ class leap_second {
 
 } // namespace chrono
 
+#    if _LIBCPP_STD_VER >= 26
+
 template <>
 struct hash<chrono::leap_second> : public __unary_function<chrono::leap_second, size_t> {
   _LIBCPP_HIDE_FROM_ABI size_t operator()(const chrono::leap_second& __lp) const _NOEXCEPT {
     return hash<chrono::seconds>{}(__lp.value());
   }
 };
 
+#    endif // _LIBCPP_STD_VER >= 26
+
 #  endif // _LIBCPP_STD_VER >= 20
 
 _LIBCPP_END_NAMESPACE_STD
diff --git a/libcxx/include/__chrono/month.h b/libcxx/include/__chrono/month.h
@@ -109,13 +109,17 @@ inline constexpr month December{12};
 
 } // namespace chrono
 
+#  if _LIBCPP_STD_VER >= 26
+
 template <>
 struct hash<chrono::month> : public __unary_function<chrono::month, size_t> {
   _LIBCPP_HIDE_FROM_ABI size_t operator()(const chrono::month& __m) const _NOEXCEPT {
     return hash<unsigned>{}(static_cast<unsigned>(__m));
   }
 };
 
+#  endif // _LIBCPP_STD_VER >= 26
+
 _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
diff --git a/libcxx/include/__chrono/month_weekday.h b/libcxx/include/__chrono/month_weekday.h
@@ -99,6 +99,8 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday_last operator/(const weekda
 }
 } // namespace chrono
 
+#  if _LIBCPP_STD_VER >= 26
+
 template <>
 struct hash<chrono::month_weekday> : public __unary_function<chrono::month_weekday, size_t> {
   _LIBCPP_HIDE_FROM_ABI size_t operator()(const chrono::month_weekday& __mw) const _NOEXCEPT {
@@ -113,6 +115,8 @@ struct hash<chrono::month_weekday_last> : public __unary_function<chrono::month_
   }
 };
 
+#  endif // _LIBCPP_STD_VER >= 26
+
 _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
diff --git a/libcxx/include/__chrono/monthday.h b/libcxx/include/__chrono/monthday.h
@@ -127,6 +127,8 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr month_day_last operator/(last_spec, int _
 
 } // namespace chrono
 
+#  if _LIBCPP_STD_VER >= 26
+
 template <>
 struct hash<chrono::month_day> : public __unary_function<chrono::month_day, size_t> {
   _LIBCPP_HIDE_FROM_ABI size_t operator()(const chrono::month_day& __md) const _NOEXCEPT {
@@ -141,6 +143,8 @@ struct hash<chrono::month_day_last> : public __unary_function<chrono::month_day_
   }
 };
 
+#  endif // _LIBCPP_STD_VER >= 26
+
 _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
diff --git a/libcxx/include/__chrono/time_point.h b/libcxx/include/__chrono/time_point.h
@@ -225,7 +225,7 @@ operator-(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock,
 
 } // namespace chrono
 
-#if _LIBCPP_STD_VER >= 20
+#if _LIBCPP_STD_VER >= 26
 
 template <class _Clock, class _Duration>
   requires __has_enabled_hash<_Duration>::value
@@ -236,7 +236,7 @@ struct hash<chrono::time_point<_Clock, _Duration>>
   }
 };
 
-#endif // _LIBCPP_STD_VER >= 20
+#endif // _LIBCPP_STD_VER >= 26
 
 _LIBCPP_END_NAMESPACE_STD
 
diff --git a/libcxx/include/__chrono/weekday.h b/libcxx/include/__chrono/weekday.h
@@ -161,6 +161,8 @@ inline constexpr weekday Saturday{6};
 
 } // namespace chrono
 
+#  if _LIBCPP_STD_VER >= 26
+
 template <>
 struct hash<chrono::weekday> : public __unary_function<chrono::weekday, size_t> {
   _LIBCPP_HIDE_FROM_ABI size_t operator()(const chrono::weekday& __w) const _NOEXCEPT {
@@ -182,6 +184,8 @@ struct hash<chrono::weekday_last> : public __unary_function<chrono::weekday_last
   }
 };
 
+#  endif // _LIBCPP_STD_VER >= 26
+
 _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
diff --git a/libcxx/include/__chrono/year.h b/libcxx/include/__chrono/year.h
@@ -110,13 +110,17 @@ _LIBCPP_HIDE_FROM_ABI constexpr bool year::ok() const noexcept {
 
 } // namespace chrono
 
+#  if _LIBCPP_STD_VER >= 26
+
 template <>
 struct hash<chrono::year> : public __unary_function<chrono::year, size_t> {
   _LIBCPP_HIDE_FROM_ABI size_t operator()(const chrono::year& __y) const _NOEXCEPT {
     return hash<int>{}(static_cast<int>(__y));
   }
 };
 
+#  endif // _LIBCPP_STD_VER >= 26
+
 _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
diff --git a/libcxx/include/__chrono/year_month.h b/libcxx/include/__chrono/year_month.h
@@ -117,13 +117,17 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr year_month& year_month::operator-=(const
 
 } // namespace chrono
 
+#  if _LIBCPP_STD_VER >= 26
+
 template <>
 struct hash<chrono::year_month> : public __unary_function<chrono::year_month, size_t> {
   _LIBCPP_HIDE_FROM_ABI size_t operator()(const chrono::year_month& __ym) const _NOEXCEPT {
     return hash<chrono::year>{}(__ym.year()) ^ hash<chrono::month>{}(__ym.month());
   }
 };
 
+#  endif // _LIBCPP_STD_VER >= 26
+
 _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
diff --git a/libcxx/include/__chrono/year_month_day.h b/libcxx/include/__chrono/year_month_day.h
@@ -331,6 +331,8 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr bool year_month_day::ok() const noexcept
 
 } // namespace chrono
 
+#  if _LIBCPP_STD_VER >= 26
+
 template <>
 struct hash<chrono::year_month_day> : public __unary_function<chrono::year_month_day, size_t> {
   _LIBCPP_HIDE_FROM_ABI size_t operator()(const chrono::year_month_day& __ymd) const _NOEXCEPT {
@@ -345,6 +347,8 @@ struct hash<chrono::year_month_day_last> : public __unary_function<chrono::year_
   }
 };
 
+#  endif // _LIBCPP_STD_VER >= 26
+
 _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
diff --git a/libcxx/include/__chrono/year_month_weekday.h b/libcxx/include/__chrono/year_month_weekday.h
@@ -281,6 +281,8 @@ year_month_weekday_last::operator-=(const years& __dy) noexcept {
 
 } // namespace chrono
 
+#  if _LIBCPP_STD_VER >= 26
+
 template <>
 struct hash<chrono::year_month_weekday> : public __unary_function<chrono::year_month_weekday, size_t> {
   _LIBCPP_HIDE_FROM_ABI size_t operator()(const chrono::year_month_weekday& __ymw) const _NOEXCEPT {
@@ -297,6 +299,8 @@ struct hash<chrono::year_month_weekday_last> : public __unary_function<chrono::y
   }
 };
 
+#  endif // _LIBCPP_STD_VER >= 26
+
 _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
diff --git a/libcxx/include/__chrono/zoned_time.h b/libcxx/include/__chrono/zoned_time.h
@@ -217,6 +217,8 @@ operator==(const zoned_time<_Duration1, _TimeZonePtr>& __lhs, const zoned_time<_
 
 } // namespace chrono
 
+#    if _LIBCPP_STD_VER >= 26
+
 template <class _Duration, class _TimeZonePtr>
   requires __has_enabled_hash<_Duration>::value && __has_enabled_hash<_TimeZonePtr>::value
 struct hash<chrono::zoned_time<_Duration, _TimeZonePtr>>
@@ -226,6 +228,8 @@ struct hash<chrono::zoned_time<_Duration, _TimeZonePtr>>
   }
 };
 
+#    endif // _LIBCPP_STD_VER >= 26
+
 #  endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM &&
          // _LIBCPP_HAS_LOCALIZATION
 
diff --git a/libcxx/test/std/time/time.hash/time.hash_enabled.pass.cpp b/libcxx/test/std/time/time.hash/time.hash_enabled.pass.cpp
@@ -6,50 +6,56 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: c++03, c++11, c++14, c++17
+// REQUIRES: std-at-least-c++26
 
 // <chrono>
 
 // Test that <chrono> provides all of the hash specializations.
 
 #include <chrono>
 #include "poisoned_hash_helper.h"
-namespace chrono = std::chrono;
 
 int main(int, char**) {
-  test_hash_enabled<chrono::nanoseconds>();
-  test_hash_enabled<chrono::microseconds>();
-  test_hash_enabled<chrono::milliseconds>();
-  test_hash_enabled<chrono::seconds>();
-  test_hash_enabled<chrono::minutes>();
-  test_hash_enabled<chrono::hours>();
-  test_hash_enabled<chrono::days>();
-  test_hash_enabled<chrono::weeks>();
-  test_hash_enabled<chrono::months>();
-  test_hash_enabled<chrono::years>();
+  test_hash_enabled<std::chrono::nanoseconds>();
+  test_hash_enabled<std::chrono::microseconds>();
+  test_hash_enabled<std::chrono::milliseconds>();
+  test_hash_enabled<std::chrono::seconds>();
+  test_hash_enabled<std::chrono::minutes>();
+  test_hash_enabled<std::chrono::hours>();
+  test_hash_enabled<std::chrono::days>();
+  test_hash_enabled<std::chrono::weeks>();
+  test_hash_enabled<std::chrono::months>();
+  test_hash_enabled<std::chrono::years>();
+
+  test_hash_enabled<std::chrono::day>();
+  test_hash_enabled<std::chrono::month>();
+  test_hash_enabled<std::chrono::year>();
+
+  test_hash_enabled<std::chrono::weekday>();
+  test_hash_enabled<std::chrono::weekday_indexed>();
+  test_hash_enabled(std::chrono::weekday_last(std::chrono::weekday{}));
+
+  test_hash_enabled<std::chrono::month_day>();
+  test_hash_enabled(std::chrono::month_day_last(std::chrono::month{}));
+
+  test_hash_enabled(std::chrono::month_weekday(std::chrono::month{}, std::chrono::weekday_indexed{}));
 
-  test_hash_enabled<chrono::day>();
-  test_hash_enabled<chrono::month>();
-  test_hash_enabled<chrono::year>();
+  test_hash_enabled(
+      std::chrono::month_weekday_last(std::chrono::month{}, std::chrono::weekday_last(std::chrono::weekday{})));
 
-  test_hash_enabled<chrono::weekday>();
-  test_hash_enabled<chrono::weekday_indexed>();
-  test_hash_enabled(chrono::weekday_last(chrono::weekday{}));
+  test_hash_enabled<std::chrono::year_month>();
 
-  test_hash_enabled<chrono::month_day>();
-  test_hash_enabled(chrono::month_day_last(chrono::month{}));
+  test_hash_enabled<std::chrono::year_month_day>();
 
-  test_hash_enabled(chrono::month_weekday(chrono::month{}, chrono::weekday_indexed{}));
-  test_hash_enabled(chrono::month_weekday_last(chrono::month{}, chrono::weekday_last(chrono::weekday{})));
+  test_hash_enabled(
+      std::chrono::year_month_day_last(std::chrono::year{}, std::chrono::month_day_last(std::chrono::month{})));
 
-  test_hash_enabled<chrono::year_month>();
+  test_hash_enabled<std::chrono::year_month_weekday>();
 
-  test_hash_enabled<chrono::year_month_day>();
-  test_hash_enabled(chrono::year_month_day_last(chrono::year{}, chrono::month_day_last(chrono::month{})));
+  test_hash_enabled(std::chrono::year_month_weekday_last(
+      std::chrono::year{}, std::chrono::month{}, std::chrono::weekday_last(std::chrono::weekday{})));
 
-  test_hash_enabled<chrono::year_month_weekday>();
-  test_hash_enabled(
-      chrono::year_month_weekday_last(chrono::year{}, chrono::month{}, chrono::weekday_last(chrono::weekday{})));
+  test_hash_enabled(std::chrono::leap_second({}, std::chrono::sys_seconds{}, std::chrono::seconds{}));
 
   return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,8 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday_last operator/(const weekda`
`99`	`99`	`}`
`100`	`100`	`} // namespace chrono`
`101`	`101`
	`102`	`+# if _LIBCPP_STD_VER >= 26`
	`103`	`+`
`102`	`104`	`template <>`
`103`	`105`	`struct hash<chrono::month_weekday> : public __unary_function<chrono::month_weekday, size_t> {`
`104`	`106`	`_LIBCPP_HIDE_FROM_ABI size_t operator()(const chrono::month_weekday& __mw) const _NOEXCEPT {`
`@@ -113,6 +115,8 @@ struct hash<chrono::month_weekday_last> : public __unary_function<chrono::month_`
`113`	`115`	`}`
`114`	`116`	`};`
`115`	`117`
	`118`	`+# endif // _LIBCPP_STD_VER >= 26`
	`119`	`+`
`116`	`120`	`_LIBCPP_END_NAMESPACE_STD`
`117`	`121`
`118`	`122`	`#endif // _LIBCPP_STD_VER >= 20`