diff options
author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2015-12-15 16:27:36 +0100 |
---|---|---|
committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2015-12-15 16:27:36 +0100 |
commit | 9bd7f99838f1fb0f67fe5a66155dc13d075041df (patch) | |
tree | afb4ad90e0592556c6f859cab44b8bf3d96d90b8 | |
parent | 4811678630068ec56a338ebc97f1f83a13a4d807 (diff) | |
download | sigc++-9bd7f99838f1fb0f67fe5a66155dc13d075041df.tar.gz |
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.
-rw-r--r-- | sigc++/functors/macros/functor_trait.h.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sigc++/functors/macros/functor_trait.h.m4 b/sigc++/functors/macros/functor_trait.h.m4 index 27a161d..142e5f2 100644 --- a/sigc++/functors/macros/functor_trait.h.m4 +++ b/sigc++/functors/macros/functor_trait.h.m4 @@ -113,7 +113,7 @@ struct nil {}; */ struct functor_base {}; -/** Helper macro, to determine if decltype() can deduce the result type of a functor. +/** Helper class, to determine if decltype() can deduce the result type of a functor. * * @ingroup sigcfunctors */ @@ -129,17 +129,17 @@ private: int memory4; }; - static biggerthanint check(...); + static biggerthanint checksize(...); - // If decltype(&X_functor::operator()) can't be evaluated, this check() overload + // If decltype(&X_functor::operator()) can't be evaluated, this checksize() overload // is ignored because of the SFINAE rule (Substitution Failure Is Not An Error). template <typename X_functor> - static int check(X_functor* obj, decltype(&X_functor::operator()) p = nullptr); + static int checksize(X_functor* obj, decltype(&X_functor::operator()) p = nullptr); public: static const bool value #ifndef DOXYGEN_SHOULD_SKIP_THIS - = sizeof(check(static_cast<T_functor*>(nullptr))) == sizeof(int) + = sizeof(checksize(static_cast<T_functor*>(nullptr))) == sizeof(int) #endif ; }; |