diff --git a/src/mstl/functional2.h b/src/mstl/functional2.h index 7aaa75a..4f33f50 100644 --- a/src/mstl/functional2.h +++ b/src/mstl/functional2.h @@ -195,10 +195,10 @@ template struct nullary_member_function : public nullary_function { typedef CType class_type;}; -template struct unary_member_function : public std::unary_function +template struct unary_member_function { typedef CType class_type;}; -template struct binary_member_function : public std::binary_function +template struct binary_member_function { typedef CType class_type;}; template struct ternary_member_function : public ternary_function @@ -328,19 +328,19 @@ class pointer_to_quaternary_member_function : public quaternary_member_function< // ******************************************************* // ******************************************************* -template struct equal : public std::unary_function{ +template struct equal { Type operator()(const Type &x) const { return x;} }; -template struct plus : public std::unary_function{ +template struct plus { Type operator()(const Type &x) const { return x;} }; -template struct square : public std::unary_function{ +template struct square { Type operator()(const Type &x) const { return x*x;} }; -template struct cube : public std::unary_function{ +template struct cube { Type operator()(const Type &x) const { return x*x*x;} }; @@ -348,7 +348,7 @@ template struct cube : public std::unary_function{ // ******************************************************* // ******************************************************* -template struct exclusive_or : public std::binary_function{ +template struct exclusive_or { Type operator()(const Type &x,const Type &y) const { return x^y;} }; @@ -364,15 +364,13 @@ public nullary_function }; template -class UNARYFUNCTORBASE : -public std::unary_function +class UNARYFUNCTORBASE { public : virtual ~UNARYFUNCTORBASE(void){;} virtual RType operator()(AType) const =0; }; template -class BINARYFUNCTORBASE : -public std::binary_function +class BINARYFUNCTORBASE { public : virtual ~BINARYFUNCTORBASE(void){;} virtual RType operator()(AType1,AType2) const =0; };