From 43e5729f544624b9c8309b2e606397f49448c1ec Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 3 Jan 2019 15:40:59 +0100 Subject: [PATCH] declare private intersect() function as static to make clear it doesn't belong to a GeomCurve instance --- src/Mod/Part/App/Geometry.cpp | 2 +- src/Mod/Part/App/Geometry.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mod/Part/App/Geometry.cpp b/src/Mod/Part/App/Geometry.cpp index 545a7f387a..376f90e890 100644 --- a/src/Mod/Part/App/Geometry.cpp +++ b/src/Mod/Part/App/Geometry.cpp @@ -479,7 +479,7 @@ bool GeomCurve::intersect( GeomCurve * c, bool GeomCurve::intersect(const Handle(Geom_Curve) curve1, const Handle(Geom_Curve) curve2, std::vector>& points, - double tol) const + double tol) { // https://forum.freecadweb.org/viewtopic.php?f=10&t=31700 if (curve1->IsKind(STANDARD_TYPE(Geom_BoundedCurve)) && diff --git a/src/Mod/Part/App/Geometry.h b/src/Mod/Part/App/Geometry.h index ac0254aed6..b414a7b4b7 100644 --- a/src/Mod/Part/App/Geometry.h +++ b/src/Mod/Part/App/Geometry.h @@ -179,9 +179,9 @@ public: void reverse(void); protected: - bool intersect(const Handle(Geom_Curve) c, const Handle(Geom_Curve) c2, - std::vector>& points, - double tol = Precision::Confusion()) const; + static bool intersect(const Handle(Geom_Curve) c, const Handle(Geom_Curve) c2, + std::vector>& points, + double tol = Precision::Confusion()); }; class PartExport GeomBoundedCurve : public GeomCurve