From 3e041a1fb22aadd70932d4552c1286ab1bae2b71 Mon Sep 17 00:00:00 2001 From: Xavier Lamorlette Date: Tue, 29 Jan 2019 12:02:49 +0100 Subject: [PATCH] Migrate deprecated bind1st and mem_fun to C++11 bind --- src/ifcgeom/IfcGeomFilter.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ifcgeom/IfcGeomFilter.h b/src/ifcgeom/IfcGeomFilter.h index d766f2b463..4fbeca2726 100644 --- a/src/ifcgeom/IfcGeomFilter.h +++ b/src/ifcgeom/IfcGeomFilter.h @@ -171,8 +171,7 @@ namespace IfcGeom bool operator()(IfcSchema::IfcProduct* prod) const { - // @note bind1st() and mem_fun() deprecated in C++11, use bind() and mem_fn() when migrating to C++11. - return filter::match(prod, std::bind1st(std::mem_fun(&string_arg_filter::match), this)); + return filter::match(prod, std::bind(&string_arg_filter::match, this, std::placeholders::_1)); } void update_description() @@ -219,7 +218,7 @@ namespace IfcGeom bool operator()(IfcSchema::IfcProduct* prod) const { - return filter::match(prod, std::bind1st(std::mem_fun(&layer_filter::match), this)); + return filter::match(prod, std::bind(&layer_filter::match, this, std::placeholders::_1)); } struct wildcards_match @@ -285,7 +284,7 @@ namespace IfcGeom bool operator()(IfcSchema::IfcProduct* prod) const { - return filter::match(prod, std::bind1st(std::mem_fun(&entity_filter::match), this)); + return filter::match(prod, std::bind(&entity_filter::match, this, std::placeholders::_1)); } void update_description()