diff --git a/libcxx/include/__flat_map/flat_map.h b/libcxx/include/__flat_map/flat_map.h index 073b63cd8f0a661..58b362ad7a706f8 100644 --- a/libcxx/include/__flat_map/flat_map.h +++ b/libcxx/include/__flat_map/flat_map.h @@ -113,7 +113,7 @@ class flat_map { class value_compare { private: key_compare __comp_; - value_compare(key_compare __c) : __comp_(__c) {} + _LIBCPP_HIDE_FROM_ABI value_compare(key_compare __c) : __comp_(__c) {} friend flat_map; public: @@ -659,7 +659,7 @@ class flat_map { template requires __has_input_iterator_category<_InputIterator>::value - void insert(sorted_unique_t, _InputIterator __first, _InputIterator __last) { + _LIBCPP_HIDE_FROM_ABI void insert(sorted_unique_t, _InputIterator __first, _InputIterator __last) { if constexpr (sized_sentinel_for<_InputIterator, _InputIterator>) { __reserve(__last - __first); } diff --git a/libcxx/include/__locale_dir/locale_base_api.h b/libcxx/include/__locale_dir/locale_base_api.h index 5cbe91207ca74e4..8ed4c29cb8732ff 100644 --- a/libcxx/include/__locale_dir/locale_base_api.h +++ b/libcxx/include/__locale_dir/locale_base_api.h @@ -265,17 +265,17 @@ _LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wformat-nonliteral") // GCC doesn't support [[g template _LIBCPP_HIDE_FROM_ABI _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__printf__, 4, 5) int __snprintf( char* __s, size_t __n, __locale_t __loc, const char* __format, _Args&&... __args) { - return __libcpp_snprintf_l(__s, __n, __loc, __format, std::forward<_Args>(__args)...); + return std::__libcpp_snprintf_l(__s, __n, __loc, __format, std::forward<_Args>(__args)...); } template _LIBCPP_HIDE_FROM_ABI _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__printf__, 3, 4) int __asprintf( char** __s, __locale_t __loc, const char* __format, _Args&&... __args) { - return __libcpp_asprintf_l(__s, __loc, __format, std::forward<_Args>(__args)...); + return std::__libcpp_asprintf_l(__s, __loc, __format, std::forward<_Args>(__args)...); } template _LIBCPP_HIDE_FROM_ABI _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__scanf__, 3, 4) int __sscanf( const char* __s, __locale_t __loc, const char* __format, _Args&&... __args) { - return __libcpp_sscanf_l(__s, __loc, __format, std::forward<_Args>(__args)...); + return std::__libcpp_sscanf_l(__s, __loc, __format, std::forward<_Args>(__args)...); } _LIBCPP_DIAGNOSTIC_POP # undef _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT diff --git a/libcxx/include/__ranges/to.h b/libcxx/include/__ranges/to.h index 76249bdd9891c8d..c937b0656de87d4 100644 --- a/libcxx/include/__ranges/to.h +++ b/libcxx/include/__ranges/to.h @@ -111,14 +111,14 @@ template for (auto&& __ref : __range) { using _Ref = decltype(__ref); - if constexpr (requires { __result.emplace_back(declval<_Ref>()); }) { + if constexpr (requires { __result.emplace_back(std::declval<_Ref>()); }) { __result.emplace_back(std::forward<_Ref>(__ref)); - } else if constexpr (requires { __result.push_back(declval<_Ref>()); }) { + } else if constexpr (requires { __result.push_back(std::declval<_Ref>()); }) { __result.push_back(std::forward<_Ref>(__ref)); - } else if constexpr (requires { __result.emplace(__result.end(), declval<_Ref>()); }) { + } else if constexpr (requires { __result.emplace(__result.end(), std::declval<_Ref>()); }) { __result.emplace(__result.end(), std::forward<_Ref>(__ref)); } else { - static_assert(requires { __result.insert(__result.end(), declval<_Ref>()); }); + static_assert(requires { __result.insert(__result.end(), std::declval<_Ref>()); }); __result.insert(__result.end(), std::forward<_Ref>(__ref)); } }