Skip to content

Commit d7c4072

Browse files
mordanteldionne
authored andcommitted
[libc++] Remove unneeded qualifier.
In D117811 @Quuxplusone pointed out the friend declarations don't need to be qualified. Removing the qualification should avoid needing to add a GCC work-around when changing _VSTD to std. Reviewed By: Quuxplusone, philnik, #libc, ldionne Differential Revision: https://reviews.llvm.org/D118719
1 parent 9477a30 commit d7c4072

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

libcxx/include/__format/format_arg.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,12 @@ class _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT basic_format_arg {
140140
// shall be well-formed when treated as an unevaluated operand.
141141

142142
template <class _Ctx, class... _Args>
143-
_LIBCPP_HIDE_FROM_ABI
144-
_LIBCPP_AVAILABILITY_FORMAT friend __format_arg_store<_Ctx, _Args...>
145-
_VSTD::make_format_args(const _Args&...);
143+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT friend __format_arg_store<_Ctx, _Args...>
144+
make_format_args(const _Args&...);
146145

147146
template <class _Visitor, class _Ctx>
148147
_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT friend decltype(auto)
149-
_VSTD::visit_format_arg(_Visitor&& __vis, basic_format_arg<_Ctx> __arg);
148+
visit_format_arg(_Visitor&& __vis, basic_format_arg<_Ctx> __arg);
150149

151150
union {
152151
bool __boolean;

libcxx/include/__format/format_context.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,8 @@ class
132132

133133
template <class __OutIt, class __CharT>
134134
friend _LIBCPP_HIDE_FROM_ABI basic_format_context<__OutIt, __CharT>
135-
_VSTD::__format_context_create(
136-
__OutIt, basic_format_args<basic_format_context<__OutIt, __CharT>>,
137-
optional<_VSTD::locale>&&);
135+
__format_context_create(__OutIt, basic_format_args<basic_format_context<__OutIt, __CharT>>,
136+
optional<_VSTD::locale>&&);
138137

139138
// Note: the Standard doesn't specify the required constructors.
140139
_LIBCPP_HIDE_FROM_ABI
@@ -146,8 +145,7 @@ class
146145
#else
147146
template <class __OutIt, class __CharT>
148147
friend _LIBCPP_HIDE_FROM_ABI basic_format_context<__OutIt, __CharT>
149-
_VSTD::__format_context_create(
150-
__OutIt, basic_format_args<basic_format_context<__OutIt, __CharT>>);
148+
__format_context_create(__OutIt, basic_format_args<basic_format_context<__OutIt, __CharT>>);
151149

152150
_LIBCPP_HIDE_FROM_ABI
153151
explicit basic_format_context(_OutIt __out_it,

0 commit comments

Comments
 (0)