Skip to content

Commit 89dfb03

Browse files
committed
Rename apply to apply_ to avoid msvc-14.3 conflict. Fixes #53.
1 parent ac731c9 commit 89dfb03

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

include/boost/function/function_template.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,9 @@ namespace boost {
261261
actual invoker that will be used for the given function
262262
object.
263263
264-
Each specialization contains an "apply" nested class template
264+
Each specialization contains an "apply_" nested class template
265265
that accepts the function object, return type, function
266-
argument types, and allocator. The resulting "apply" class
266+
argument types, and allocator. The resulting "apply_" class
267267
contains two typedefs, "invoker_type" and "manager_type",
268268
which correspond to the invoker and manager types. */
269269
template<typename Tag>
@@ -275,7 +275,7 @@ namespace boost {
275275
{
276276
template<typename FunctionPtr,
277277
typename R, typename... T>
278-
struct apply
278+
struct apply_
279279
{
280280
typedef typename get_function_invoker<
281281
FunctionPtr,
@@ -308,7 +308,7 @@ namespace boost {
308308
{
309309
template<typename MemberPtr,
310310
typename R, typename... T>
311-
struct apply
311+
struct apply_
312312
{
313313
typedef typename get_member_invoker<
314314
MemberPtr,
@@ -341,7 +341,7 @@ namespace boost {
341341
{
342342
template<typename FunctionObj,
343343
typename R, typename... T>
344-
struct apply
344+
struct apply_
345345
{
346346
typedef typename get_function_obj_invoker<
347347
FunctionObj,
@@ -374,7 +374,7 @@ namespace boost {
374374
{
375375
template<typename RefWrapper,
376376
typename R, typename... T>
377-
struct apply
377+
struct apply_
378378
{
379379
typedef typename get_function_ref_invoker<
380380
typename RefWrapper::type,
@@ -923,7 +923,7 @@ namespace boost {
923923
typedef typename boost::detail::function::get_function_tag<Functor>::type tag;
924924
typedef boost::detail::function::get_invoker<tag> get_invoker;
925925
typedef typename get_invoker::
926-
template apply<Functor, R,
926+
template apply_<Functor, R,
927927
T...>
928928
handler_type;
929929

0 commit comments

Comments
 (0)