Skip to content

Commit 8111867

Browse files
committed
[libc++] Fix a few problems found by clang-tidy
1 parent f0b8025 commit 8111867

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

libcxx/include/__flat_map/flat_map.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class flat_map {
113113
class value_compare {
114114
private:
115115
key_compare __comp_;
116-
value_compare(key_compare __c) : __comp_(__c) {}
116+
_LIBCPP_HIDE_FROM_ABI value_compare(key_compare __c) : __comp_(__c) {}
117117
friend flat_map;
118118

119119
public:
@@ -659,7 +659,7 @@ class flat_map {
659659

660660
template <class _InputIterator>
661661
requires __has_input_iterator_category<_InputIterator>::value
662-
void insert(sorted_unique_t, _InputIterator __first, _InputIterator __last) {
662+
_LIBCPP_HIDE_FROM_ABI void insert(sorted_unique_t, _InputIterator __first, _InputIterator __last) {
663663
if constexpr (sized_sentinel_for<_InputIterator, _InputIterator>) {
664664
__reserve(__last - __first);
665665
}

libcxx/include/__locale_dir/locale_base_api.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,17 +265,17 @@ _LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wformat-nonliteral") // GCC doesn't support [[g
265265
template <class... _Args>
266266
_LIBCPP_HIDE_FROM_ABI _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__printf__, 4, 5) int __snprintf(
267267
char* __s, size_t __n, __locale_t __loc, const char* __format, _Args&&... __args) {
268-
return __libcpp_snprintf_l(__s, __n, __loc, __format, std::forward<_Args>(__args)...);
268+
return std::__libcpp_snprintf_l(__s, __n, __loc, __format, std::forward<_Args>(__args)...);
269269
}
270270
template <class... _Args>
271271
_LIBCPP_HIDE_FROM_ABI _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__printf__, 3, 4) int __asprintf(
272272
char** __s, __locale_t __loc, const char* __format, _Args&&... __args) {
273-
return __libcpp_asprintf_l(__s, __loc, __format, std::forward<_Args>(__args)...);
273+
return std::__libcpp_asprintf_l(__s, __loc, __format, std::forward<_Args>(__args)...);
274274
}
275275
template <class... _Args>
276276
_LIBCPP_HIDE_FROM_ABI _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__scanf__, 3, 4) int __sscanf(
277277
const char* __s, __locale_t __loc, const char* __format, _Args&&... __args) {
278-
return __libcpp_sscanf_l(__s, __loc, __format, std::forward<_Args>(__args)...);
278+
return std::__libcpp_sscanf_l(__s, __loc, __format, std::forward<_Args>(__args)...);
279279
}
280280
_LIBCPP_DIAGNOSTIC_POP
281281
# undef _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT

libcxx/include/__ranges/to.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@ template <class _Container, input_range _Range, class... _Args>
111111

112112
for (auto&& __ref : __range) {
113113
using _Ref = decltype(__ref);
114-
if constexpr (requires { __result.emplace_back(declval<_Ref>()); }) {
114+
if constexpr (requires { __result.emplace_back(std::declval<_Ref>()); }) {
115115
__result.emplace_back(std::forward<_Ref>(__ref));
116-
} else if constexpr (requires { __result.push_back(declval<_Ref>()); }) {
116+
} else if constexpr (requires { __result.push_back(std::declval<_Ref>()); }) {
117117
__result.push_back(std::forward<_Ref>(__ref));
118-
} else if constexpr (requires { __result.emplace(__result.end(), declval<_Ref>()); }) {
118+
} else if constexpr (requires { __result.emplace(__result.end(), std::declval<_Ref>()); }) {
119119
__result.emplace(__result.end(), std::forward<_Ref>(__ref));
120120
} else {
121-
static_assert(requires { __result.insert(__result.end(), declval<_Ref>()); });
121+
static_assert(requires { __result.insert(__result.end(), std::declval<_Ref>()); });
122122
__result.insert(__result.end(), std::forward<_Ref>(__ref));
123123
}
124124
}

0 commit comments

Comments
 (0)