3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Fraser999/Catch

This commit is contained in:
Fraser Hutchison 2014-03-07 19:55:45 +00:00
parent dd2810d60a 79b81f9b26
commit 29e965cc25
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/internal/clara.h
View File

@ -355,6 +355,10 @@ namespace Clara {
void (*function)( C& );
};
#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable: 4702)
#endif
template<typename C, typename T>
struct BoundBinaryFunction : IArgFunction<C>{
BoundBinaryFunction( void (*_function)( C&, T ) ) : function( _function ) {}
@ -372,6 +376,9 @@ namespace Clara {
virtual IArgFunction<C>* clone() const { return new BoundBinaryFunction( *this ); }
void (*function)( C&, T );
};
#ifdef _MSC_VER
# pragma warning(pop)
#endif
template<typename C, typename M>
BoundArgFunction<C> makeBoundField( M C::* _member ) {