Merge pull request #263 from mzf-guest/remove_unary_binary_functions

Remove obsolete unary and binary functions.

Author: prj-

plugin/seq/msh3.cpp

@@ -1981,12 +1981,18 @@ Mesh3 *GluMesh3(listMesh3 const &lst) {
 }
 
 template< class RR, class AA = RR, class BB = AA >
-struct Op3_addmesh : public binary_function< AA, BB, RR > {
+struct Op3_addmesh {
+   using first_argument_type  = AA;
+   using second_argument_type = BB;
+   using result_type          = RR;
   static RR f(Stack s, const AA &a, const BB &b) { return RR(s, a, b); }
 };
 
 template< bool INIT, class RR, class AA = RR, class BB = AA >
-struct Op3_setmesh : public binary_function< AA, BB, RR > {
+struct Op3_setmesh {
+   using first_argument_type  = AA;
+   using second_argument_type = BB;
+   using result_type          = RR;
   static RR f(Stack stack, const AA &a, const BB &b) {
     ffassert(a);
     const pmesh3 p = GluMesh3(b);
@@ -2362,12 +2368,18 @@ MeshL *GluMesh(listMeshT<MeshL> const &lst) {
 
 
 template< class RR, class AA = RR, class BB = AA >
-struct Op3_addmeshS : public binary_function< AA, BB, RR > {
+struct Op3_addmeshS {
+   using first_argument_type  = AA;
+   using second_argument_type = BB;
+   using result_type          = RR;
   static RR f(Stack s, const AA &a, const BB &b) { return RR(s, a, b); }
 };
 
 template< bool INIT, class RR, class AA = RR, class BB = AA >
-struct Op3_setmeshS : public binary_function< AA, BB, RR > {
+struct Op3_setmeshS {
+   using first_argument_type  = AA;
+   using second_argument_type = BB;
+   using result_type          = RR;
   static RR f(Stack stack, const AA &a, const BB &b) {
     ffassert(a);
     const pmeshS p = GluMesh(b);
@@ -2381,12 +2393,18 @@ struct Op3_setmeshS : public binary_function< AA, BB, RR > {
 
 
 template< class RR, class AA = RR, class BB = AA >
-struct Op3_addmeshL : public binary_function< AA, BB, RR > {
+struct Op3_addmeshL {
+   using first_argument_type  = AA;
+   using second_argument_type = BB;
+   using result_type          = RR;
     static RR f(Stack s, const AA &a, const BB &b) { return RR(s, a, b); }
 };
 
 template< bool INIT, class RR, class AA = RR, class BB = AA >
-struct Op3_setmeshL : public binary_function< AA, BB, RR > {
+struct Op3_setmeshL {
+   using first_argument_type  = AA;
+   using second_argument_type = BB;
+   using result_type          = RR;
     static RR f(Stack stack, const AA &a, const BB &b) {
         ffassert(a);
         const pmeshL p = GluMesh(b);

src/fflib/AFunction.cpp

@@ -148,7 +148,10 @@ template<class T> inline T Max (const T &a,const T & b,const T & c,const T & d){
 
 template<class T> inline T Square (const T &a){return a*a;}
 
-struct SubArray2: public binary_function<long,long,SubArray> {
+struct SubArray2 {
+  using first_argument_type  = long;
+  using second_argument_type = long;
+  using result_type          = SubArray;
   static SubArray f(const long & a,const long & b)  {
     return SubArray(b-a+1,a);} };
 struct SubArray3: public ternary_function<long,long,long,SubArray> {
@@ -236,12 +239,17 @@ R *MakePtrWithDel( A  const & a)
   return r;}
 
 template<class R,class RR>
-struct Op1_new_pstring: public unary_function<string*,R> {
+struct Op1_new_pstring{
+  using argument_type  = string*;
+  using result_type    = R;
   static R f(string * const & a)  {R r =  new RR(a->c_str());
     return r;} };
 
 template<class R,class RR>
-struct Op2_set_pstring: public binary_function<R,string*,R> {
+struct Op2_set_pstring {
+  using first_argument_type  = R;
+  using second_argument_type = string*;
+  using result_type          = R;
   static R  f(R const & p,string * const & a)  {*p =  new RR(a->c_str());
    if ( !*p || !**p) {
        cerr << " Error opening file " << *a << endl;

src/fflib/AFunction.hpp

@@ -183,8 +183,11 @@ Expression NewExpression(Function2,Expression,Expression);
 inline Type_Expr make_Type_Expr(aType t, E_F0  * e) {return make_pair(t,e);}
 inline Type_Expr make_Type_Expr( E_F0  * e,aType t) {return make_pair(t,e);}
 
-struct Keyless : binary_function<const char *,const char *, bool>
+struct Keyless
    { 
+    using first_argument_type  = const char *;
+    using second_argument_type = const char *;
+    using result_type          = bool;
     typedef const char * Key;
     bool operator()(const Key& x, const Key& y) const { return strcmp(x,y)<0;} };
 
@@ -372,8 +375,12 @@ class E_F0 :public CodeAlloc
    {
    public:
        static E_F0 *tnull;
-  struct kless : binary_function<Expression,Expression, bool>
-   { bool operator()(const Expression& x, const Expression& y) const{ 
+  struct kless
+   {
+     using first_argument_type  = Expression;
+     using second_argument_type = Expression;
+     using result_type          = bool;
+     bool operator()(const Expression& x, const Expression& y) const{
      //cout << x << " " << y << x->compare(y) << " ::: ";
       int r1 = x->compare(y);// , r2 = y->compare(x);
      //assert(r1+r2==0);