Fix compatibility with C++17.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 7 insertions, 7 deletions

diff --git a/kig/objects/object_calcer.cpp b/kig/objects/object_calcer.cpp
index 40545ed1..b15766bc 100644
--- a/kig/objects/object_calcer.cpp
+++ b/kig/objects/object_calcer.cpp
@@ -31,7 +31,7 @@ void ObjectTypeCalcer::calc( const KigDocument& doc )
   Args a;
   a.reserve( mparents.size() );
   std::transform( mparents.begin(), mparents.end(),
-                  std::back_inserter( a ), std::mem_fun( &ObjectCalcer::imp ) );
+                  std::back_inserter( a ), std::mem_fn( &ObjectCalcer::imp ) );
   ObjectImp* n = mtype->calc( a, doc );
   delete mimp;
   mimp = n;
@@ -42,7 +42,7 @@ ObjectTypeCalcer::ObjectTypeCalcer( const ObjectType* type,
   : mparents( ( sort )?type->sortArgs( parents ):parents ), mtype( type ), mimp( 0 )
 {
   std::for_each( mparents.begin(), mparents.end(),
-                 std::bind2nd( std::mem_fun( &ObjectCalcer::addChild ), this ) );
+                 std::bind( std::mem_fn( &ObjectCalcer::addChild ), std::placeholders::_1, this ) );
 }
 
 ObjectCalcer::~ObjectCalcer()
@@ -122,7 +122,7 @@ void ObjectCalcer::delChild( ObjectCalcer* c )
 ObjectTypeCalcer::~ObjectTypeCalcer()
 {
   std::for_each( mparents.begin(), mparents.end(),
-                 std::bind2nd( std::mem_fun( &ObjectCalcer::delChild ), this ) );
+                 std::bind( std::mem_fn( &ObjectCalcer::delChild ), std::placeholders::_1, this ) );
   delete mimp;
 }
 
@@ -201,7 +201,7 @@ const ObjectImpType* ObjectTypeCalcer::impRequirement(
   std::transform(
     os.begin(), os.end(),
     std::back_inserter( args ),
-    std::mem_fun( &ObjectCalcer::imp ) );
+    std::mem_fn( &ObjectCalcer::imp ) );
   assert( std::find( args.begin(), args.end(), o->imp() ) != args.end() );
   return mtype->impRequirement( o->imp(), args );
 }
@@ -219,9 +219,9 @@ void ObjectConstCalcer::setImp( ObjectImp* newimp )
 void ObjectTypeCalcer::setParents( const std::vector<ObjectCalcer*> np )
 {
   std::for_each( np.begin(), np.end(),
-                 std::bind2nd( std::mem_fun( &ObjectCalcer::addChild ), this ) );
+                 std::bind( std::mem_fn( &ObjectCalcer::addChild ), std::placeholders::_1, this ) );
   std::for_each( mparents.begin(), mparents.end(),
-                 std::bind2nd( std::mem_fun( &ObjectCalcer::delChild ), this ) );
+                 std::bind( std::mem_fn( &ObjectCalcer::delChild ), std::placeholders::_1, this ) );
   mparents = np;
 }
 
@@ -314,7 +314,7 @@ bool ObjectTypeCalcer::isDefinedOnOrThrough( const ObjectCalcer* o ) const
   std::transform(
     mparents.begin(), mparents.end(),
     std::back_inserter( args ),
-    std::mem_fun( &ObjectCalcer::imp ) );
+    std::mem_fn( &ObjectCalcer::imp ) );
   if ( std::find( args.begin(), args.end(), o->imp() ) == args.end() )
     return false;