From 4bc681535822790950d175e4947c4729c2cf333c Mon Sep 17 00:00:00 2001 From: gaohongtao Date: Mon, 7 Apr 2025 17:00:27 +0800 Subject: [PATCH] [libcxx]Enable _LIBCPP_HAS_COND_CLOCKWAIT for condition_variable https://gitee.com/openharmony/third_party_llvm-project/issues/IB0ONT Signed-off-by: lightaooii --- libcxx/include/__config | 4 ++++ libcxx/include/__mutex_base | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libcxx/include/__config b/libcxx/include/__config index 8bc9e49e9b35..887ca8573a69 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -933,6 +933,10 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD # if _LIBCPP_GLIBC_PREREQ(2, 30) # define _LIBCPP_HAS_COND_CLOCKWAIT # endif +# elif defined(__OHOS_FAMILY__) // OHOS_LOCAL +# if defined(_LIBCPP_HAS_MUSL_LIBC) +# define _LIBCPP_HAS_COND_CLOCKWAIT +# endif # endif # endif diff --git a/libcxx/include/__mutex_base b/libcxx/include/__mutex_base index ac0d090b7d19..9fa1404cbd08 100644 --- a/libcxx/include/__mutex_base +++ b/libcxx/include/__mutex_base @@ -327,7 +327,7 @@ private: void __do_timed_wait(unique_lock& __lk, chrono::time_point) _NOEXCEPT; #if defined(_LIBCPP_HAS_COND_CLOCKWAIT) - void __do_timed_wait(unique_lock& __lk, + _LIBCPP_HIDE_FROM_ABI void __do_timed_wait(unique_lock& __lk, chrono::time_point) _NOEXCEPT; #endif template -- Gitee