diff --git a/libcxx/include/__chrono/convert_to_tm.h b/libcxx/include/__chrono/convert_to_tm.h index 0974e9466601b0..36846b3f714042 100644 --- a/libcxx/include/__chrono/convert_to_tm.h +++ b/libcxx/include/__chrono/convert_to_tm.h @@ -109,11 +109,11 @@ _LIBCPP_HIDE_FROM_ABI _Tm __convert_to_tm(const _ChronoT& __value) { __result.tm_year = static_cast(__value.year()) - 1900; __result.tm_mon = static_cast(__value.month()) - 1; } else if constexpr (same_as<_ChronoT, chrono::year_month_day> || same_as<_ChronoT, chrono::year_month_day_last>) { - return __convert_to_tm<_Tm>( + return std::__convert_to_tm<_Tm>( chrono::year_month_day{__value}, chrono::weekday{static_cast(__value)}); } else if constexpr (same_as<_ChronoT, chrono::year_month_weekday> || same_as<_ChronoT, chrono::year_month_weekday_last>) { - return __convert_to_tm<_Tm>(chrono::year_month_day{static_cast(__value)}, __value.weekday()); + return std::__convert_to_tm<_Tm>(chrono::year_month_day{static_cast(__value)}, __value.weekday()); } else static_assert(sizeof(_ChronoT) == 0, "Add the missing type specialization"); diff --git a/libcxx/include/mutex b/libcxx/include/mutex index 5c7c332180bf8f..9b726d59b10596 100644 --- a/libcxx/include/mutex +++ b/libcxx/include/mutex @@ -681,7 +681,7 @@ call_once(once_flag& __flag, _Callable& __func) if (__libcpp_acquire_load(&__flag.__state_) != ~once_flag::_State_type(0)) { __call_once_param<_Callable> __p(__func); - __call_once(__flag.__state_, &__p, &__call_once_proxy<_Callable>); + std::__call_once(__flag.__state_, &__p, &__call_once_proxy<_Callable>); } } @@ -693,7 +693,7 @@ call_once(once_flag& __flag, const _Callable& __func) if (__libcpp_acquire_load(&__flag.__state_) != ~once_flag::_State_type(0)) { __call_once_param __p(__func); - __call_once(__flag.__state_, &__p, &__call_once_proxy); + std::__call_once(__flag.__state_, &__p, &__call_once_proxy); } }