Skip to content

Commit 9bd7f99

Browse files
author
Kjell Ahlstedt
committed
can_deduce_result_type_with_decltype: Rename the check() methods
* sigc++/functors/macros/functor_trait.h.m4: Rename the check() methods. check() is a preprocessor macro in Mac OS X. Bug #759315.
1 parent 4811678 commit 9bd7f99

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

sigc++/functors/macros/functor_trait.h.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ struct nil {};
113113
*/
114114
struct functor_base {};
115115

116-
/** Helper macro, to determine if decltype() can deduce the result type of a functor.
116+
/** Helper class, to determine if decltype() can deduce the result type of a functor.
117117
*
118118
* @ingroup sigcfunctors
119119
*/
@@ -129,17 +129,17 @@ private:
129129
int memory4;
130130
};
131131

132-
static biggerthanint check(...);
132+
static biggerthanint checksize(...);
133133

134-
// If decltype(&X_functor::operator()) can't be evaluated, this check() overload
134+
// If decltype(&X_functor::operator()) can't be evaluated, this checksize() overload
135135
// is ignored because of the SFINAE rule (Substitution Failure Is Not An Error).
136136
template <typename X_functor>
137-
static int check(X_functor* obj, decltype(&X_functor::operator()) p = nullptr);
137+
static int checksize(X_functor* obj, decltype(&X_functor::operator()) p = nullptr);
138138

139139
public:
140140
static const bool value
141141
#ifndef DOXYGEN_SHOULD_SKIP_THIS
142-
= sizeof(check(static_cast<T_functor*>(nullptr))) == sizeof(int)
142+
= sizeof(checksize(static_cast<T_functor*>(nullptr))) == sizeof(int)
143143
#endif
144144
;
145145
};

0 commit comments

Comments
 (0)