fix include and tests

Author: yuxuanchen1997

libcxx/include/__chrono/is_clock.h

@@ -11,6 +11,10 @@
 #define _LIBCPP___CHRONO_IS_CLOCK_H
 
 #include <__config>
+
+#include <__chrono/duration.h>
+#include <__chrono/time_point.h>
+#include <__concepts/same_as.h>
 #include <__type_traits/integral_constant.h>
 #include <__type_traits/is_arithmetic.h>
 #include <__type_traits/is_same.h>
@@ -26,12 +30,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 namespace chrono {
 
-template <class _Rep, class _Period>
-class duration;
-
-template <class _Clock, class _Duration>
-class time_point;
-
 // Helper to check that _Tp::time_point has the form time_point<_, typename _Tp::duration>.
 template <class _TimePoint, class _ClockType>
 inline constexpr bool __is_valid_clock_time_point_v = false;

libcxx/test/std/time/time.traits.is.clock/trait.is.clock.compile.verify.cpp renamed to libcxx/test/libcxx/time/time.traits.is.clock/trait.is.clock.compile.verify.cpp

@@ -11,18 +11,8 @@
 #include <chrono>
 #include <ratio>
 
-#if !__has_warning("-Winvalid-specializations")
-// expected-no-diagnostics
-#else
-
-namespace std::chrono {
-// try adding specializations to is_clock
 template <>
-struct is_clock<int> : std::false_type {}; // expected-error@*:* {{'is_clock' cannot be specialized}}
+struct std::chrono::is_clock<int> : std::false_type {}; // expected-error@*:* {{'is_clock' cannot be specialized}}
 
 template <>
-constexpr bool is_clock_v<float> = false; // expected-error@*:* {{'is_clock_v' cannot be specialized}}
-
-} // namespace std::chrono
-
-#endif
+constexpr bool std::chrono::is_clock_v<float> = false; // expected-error@*:* {{'is_clock_v' cannot be specialized}}

libcxx/test/std/time/time.traits.is.clock/trait.is.clock.compile.pass.cpp

@@ -176,19 +176,13 @@ static_assert(std::chrono::is_clock_v<std::chrono::system_clock>);
 
 // Test standard clock types
 static_assert(std::chrono::is_clock_v<std::chrono::system_clock>);
-#if _LIBCPP_HAS_MONOTONIC_CLOCK
-static_assert(std::chrono::is_clock_v<std::chrono::steady_clock>);
-#endif
 static_assert(std::chrono::is_clock_v<std::chrono::high_resolution_clock>);
 
 // Test non-clock types
 static_assert(!std::chrono::is_clock_v<EmptyStruct>);
 static_assert(!std::chrono::is_clock_v<int>);
 static_assert(!std::chrono::is_clock_v<void>);
 static_assert(!std::chrono::is_clock_v<std::chrono::system_clock::time_point>);
-#if _LIBCPP_HAS_MONOTONIC_CLOCK
-static_assert(!std::chrono::is_clock_v<std::chrono::steady_clock::time_point>);
-#endif
 static_assert(!std::chrono::is_clock_v<std::chrono::seconds>);
 static_assert(!std::chrono::is_clock_v<std::chrono::milliseconds>);