From 7c3164ff618c188dce2dcc0b640f04a88aa8a708 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 12 Dec 2024 15:58:57 +0100 Subject: [PATCH] Part: Fix compiler warnings [-Wodr] Type 'struct EdgePoints' violates the C++ One Definition Rule because it's defined in two different translation units --- src/Mod/Part/App/AppPartPy.cpp | 5 +++++ src/Mod/Part/App/TopoShapeExpansion.cpp | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/Mod/Part/App/AppPartPy.cpp b/src/Mod/Part/App/AppPartPy.cpp index 20d680b364..3c5e718f92 100644 --- a/src/Mod/Part/App/AppPartPy.cpp +++ b/src/Mod/Part/App/AppPartPy.cpp @@ -152,12 +152,17 @@ PartExport std::vector getPyShapes(PyObject *obj) { return ret; } +namespace +{ + struct EdgePoints { gp_Pnt v1, v2; std::list::iterator it; TopoDS_Edge edge; }; +} + PartExport std::list sort_Edges(double tol3d, std::list& edges) { tol3d = tol3d * tol3d; diff --git a/src/Mod/Part/App/TopoShapeExpansion.cpp b/src/Mod/Part/App/TopoShapeExpansion.cpp index 13e6a1ce25..87bfd083a4 100644 --- a/src/Mod/Part/App/TopoShapeExpansion.cpp +++ b/src/Mod/Part/App/TopoShapeExpansion.cpp @@ -3119,6 +3119,9 @@ TopoShape& TopoShape::makeElementWires(const std::vector& shapes, return makeElementCompound(wires, nullptr, SingleShapeCompoundCreationPolicy::returnShape); } +namespace +{ + struct EdgePoints { @@ -3145,6 +3148,8 @@ struct EdgePoints } }; +} + TopoShape TopoShape::reverseEdge(const TopoShape& edge) { Standard_Real first = NAN;