kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

remove deprecated std::unary_function

Browse Source
This commit is contained in:
wmayer
2020-05-11 13:55:54 +02:00
parent 5ece278c94
commit 15897238e1
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Mesh/App/Core/Tools.h
View File

@@ -141,7 +141,7 @@ inline bool MeshSearchNeighbours::TriangleCutsSphere (const MeshFacet &rclF) con
return fSqrDist < fRSqr;
}
class MeshFaceIterator : public std::unary_function<unsigned long, Base::Vector3f>
class MeshFaceIterator
{
public:
MeshFaceIterator(const MeshKernel& mesh)
@@ -156,7 +156,7 @@ private:
MeshFacetIterator it;
};
class MeshVertexIterator : public std::unary_function<unsigned long, Base::Vector3f>
class MeshVertexIterator
{
public:
MeshVertexIterator(const MeshKernel& mesh)
@@ -172,7 +172,7 @@ private:
};
template <class T>
class MeshNearestIndexToPlane : public std::unary_function<unsigned long, void>
class MeshNearestIndexToPlane
{
public:
MeshNearestIndexToPlane(const MeshKernel& mesh, const Base::Vector3f& b, const Base::Vector3f& n)

4
src/Mod/Sketcher/App/Analyse.h
View File

@@ -39,8 +39,10 @@ struct ConstraintIds {
Sketcher::ConstraintType Type;
};
struct Constraint_Equal : public std::unary_function<const struct Sketcher::ConstraintIds&, bool>
struct Constraint_Equal
{
typedef ConstraintIds argument_type;
typedef bool result_type;
struct Sketcher::ConstraintIds c;
Constraint_Equal(const ConstraintIds& c) : c(c)
{