From 7812ecb1897362d240755d414e243b498e86f98a Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Sun, 21 Feb 2021 16:34:34 +0100 Subject: [PATCH] C++17 compat --- src/ifcgeom/taxonomy.h | 2 +- src/ifcparse/IfcSchema.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ifcgeom/taxonomy.h b/src/ifcgeom/taxonomy.h index 11ba421914..c0d5aaa894 100644 --- a/src/ifcgeom/taxonomy.h +++ b/src/ifcgeom/taxonomy.h @@ -346,7 +346,7 @@ struct collection : public geom_item { collection() {} collection(const collection& other) { - std::transform(other.children.begin(), other.children.end(), std::back_inserter(children), std::mem_fun(&item::clone)); + std::transform(other.children.begin(), other.children.end(), std::back_inserter(children), std::mem_fn(&item::clone)); } template diff --git a/src/ifcparse/IfcSchema.h b/src/ifcparse/IfcSchema.h index 158dcd1547..9cd54d9a9f 100644 --- a/src/ifcparse/IfcSchema.h +++ b/src/ifcparse/IfcSchema.h @@ -243,7 +243,7 @@ namespace IfcParse { std::vector inverse_attributes_; - class attribute_by_name_cmp : public std::unary_function { + class attribute_by_name_cmp { private: std::string name_; public: @@ -399,14 +399,14 @@ namespace IfcParse { std::vector enumeration_types_; std::vector entities_; - class declaration_by_name_cmp : public std::binary_function { + class declaration_by_name_cmp { public: bool operator()(const declaration* decl, const std::string& name) { return decl->name_lc() < name; } }; - class declaration_by_index_sort : public std::binary_function { + class declaration_by_index_sort { public: bool operator()(const declaration* a, const declaration* b) { return a->index_in_schema() < b->index_in_schema();