<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7265813a3a617dc294297ec1b0bbeb5e0e011ebc">https://github.com/macports/macports-ports/commit/7265813a3a617dc294297ec1b0bbeb5e0e011ebc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7265813a3a6 freecad: update to 0.18.5
</span>7265813a3a6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7265813a3a617dc294297ec1b0bbeb5e0e011ebc
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Nov 26 18:26:40 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> freecad: update to 0.18.5
</span>---
cad/freecad/Portfile | 14 +-
.../files/patch-src-Mod-Part-App-Geometry.cpp.diff | 165 ---------------------
...tch-src-Mod-Part-App-PropertyTopoShape.cpp.diff | 17 ---
3 files changed, 7 insertions(+), 189 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/freecad/Portfile b/cad/freecad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f3168259728..3894f220824 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/freecad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cad/freecad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup compilers 1.0
</span> PortGroup github 1.0
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup FreeCAD FreeCAD 0.18.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup FreeCAD FreeCAD 0.18.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> name freecad
categories cad
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +27,9 @@ long_description \
</span>
homepage https://www.freecadweb.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2fdb6bb247571e2ffaffaca1defb02ca0b2e1cc5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d2f10f861cbcc9d19b34f79cd1c96baca2f23174f232e834f64a7c4a74f5f1e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 219760632
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 de9aac31ea36d8353715c72fa2be3512af71f265 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8a715318b395d47a882359c05ed0fa359773dd3d593c50ac773d728ca84aeeef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 219760077
</span>
depends_build-append port:doxygen \
path:bin/dot:graphviz
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,6 +51,8 @@ depends_lib-append port:boost \
</span> port:xercesc3 \
port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xcode yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_run port:qt4-mac-sqlite3-plugin
patchfiles cMake-FindCoin3D.cmake.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,9 +65,7 @@ patchfiles-append FindPySideTools.cmake.patch
</span>
# see: https://trac.macports.org/ticket/60375
patchfiles-append patch-src-Mod-Drawing-App-DrawingExport.cpp.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-Mod-Part-App-Geometry.cpp.diff \
</span> patch-src-Mod-Part-App-Geometry2d.cpp.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-Mod-Part-App-PropertyTopoShape.cpp.diff \
</span> patch-src-Mod-Raytracing-App-AppRaytracingPy.cpp.diff \
patch-src-Mod-Raytracing-App-LuxFeature.cpp.diff \
patch-src-Mod-Raytracing-App-RayFeature.cpp.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/freecad/files/patch-src-Mod-Part-App-Geometry.cpp.diff b/cad/freecad/files/patch-src-Mod-Part-App-Geometry.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0b392acbef1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/freecad/files/patch-src-Mod-Part-App-Geometry.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,165 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Mod/Part/App/Geometry.cpp.orig 2019-10-22 11:53:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Mod/Part/App/Geometry.cpp 2020-04-22 09:45:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -203,7 +203,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void Geometry::Save(Base::Writer &writer) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char c = Construction?'1':'0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- writer.Stream() << writer.ind() << "<Construction value=\"" << c << "\"/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ writer.Stream() << writer.ind() << "<Construction value=\"" << c << "\"/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void Geometry::Restore(Base::XMLReader &reader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -323,7 +323,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "X=\"" << Point.x <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" Y=\"" << Point.y <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" Z=\"" << Point.z <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "\"/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "\"/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void GeomPoint::Restore(Base::XMLReader &reader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -793,7 +793,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << writer.ind()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "<BezierCurve "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "PolesCount=\"" << poles.size() <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "\">" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "\">" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- writer.incInd();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -808,11 +808,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" Y=\"" << (*itp).y <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" Z=\"" << (*itp).z <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" Weight=\"" << (*itw) <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "\"/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "\"/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- writer.decInd();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- writer.Stream() << writer.ind() << "</BezierCurve>" << endl ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ writer.Stream() << writer.ind() << "</BezierCurve>" << std::endl ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void GeomBezierCurve::Restore(Base::XMLReader& reader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1270,7 +1270,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" KnotsCount=\"" << knots.size() <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" Degree=\"" << degree <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" IsPeriodic=\"" << (int) isperiodic <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "\">" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "\">" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- writer.incInd();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1285,7 +1285,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" Y=\"" << (*itp).y <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" Z=\"" << (*itp).z <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" Weight=\"" << (*itw) <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "\"/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "\"/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::vector<double>::const_iterator itk;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1297,11 +1297,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "<Knot "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "Value=\"" << (*itk)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "\" Mult=\"" << (*itm) <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "\"/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "\"/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- writer.decInd();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- writer.Stream() << writer.ind() << "</BSplineCurve>" << endl ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ writer.Stream() << writer.ind() << "</BSplineCurve>" << std::endl ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void GeomBSplineCurve::Restore(Base::XMLReader& reader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1903,7 +1903,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" NormalZ=\"" << normal.Z() <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" AngleXU=\"" << AngleXU <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" Radius=\"" << this->myCurve->Radius() <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "\"/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "\"/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void GeomCircle::Restore(Base::XMLReader& reader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2132,7 +2132,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" Radius=\"" << circle->Radius() <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" StartAngle=\"" << this->myCurve->FirstParameter() <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" EndAngle=\"" << this->myCurve->LastParameter() <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "\"/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "\"/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void GeomArcOfCircle::Restore(Base::XMLReader &reader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2383,7 +2383,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "MajorRadius=\"" << this->myCurve->MajorRadius() << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "MinorRadius=\"" << this->myCurve->MinorRadius() << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "AngleXU=\"" << AngleXU << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- << "/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << "/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void GeomEllipse::Restore(Base::XMLReader& reader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2653,7 +2653,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "AngleXU=\"" << AngleXU << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "StartAngle=\"" << this->myCurve->FirstParameter() << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "EndAngle=\"" << this->myCurve->LastParameter() << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- << "/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << "/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void GeomArcOfEllipse::Restore(Base::XMLReader &reader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2826,7 +2826,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "MajorRadius=\"" << this->myCurve->MajorRadius() << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "MinorRadius=\"" << this->myCurve->MinorRadius() << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "AngleXU=\"" << AngleXU << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- << "/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << "/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void GeomHyperbola::Restore(Base::XMLReader& reader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3083,7 +3083,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "AngleXU=\"" << AngleXU << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "StartAngle=\"" << this->myCurve->FirstParameter() << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "EndAngle=\"" << this->myCurve->LastParameter() << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- << "/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << "/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void GeomArcOfHyperbola::Restore(Base::XMLReader &reader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3236,7 +3236,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "NormalZ=\"" << normal.Z() << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "Focal=\"" << this->myCurve->Focal() << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "AngleXU=\"" << AngleXU << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- << "/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << "/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void GeomParabola::Restore(Base::XMLReader& reader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3436,7 +3436,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "AngleXU=\"" << AngleXU << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "StartAngle=\"" << this->myCurve->FirstParameter() << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "EndAngle=\"" << this->myCurve->LastParameter() << "\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- << "/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << "/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void GeomArcOfParabola::Restore(Base::XMLReader &reader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3581,7 +3581,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" DirX=\"" << Dir.x <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" DirY=\"" << Dir.y <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" DirZ=\"" << Dir.z <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "\"/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "\"/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void GeomLine::Restore(Base::XMLReader &reader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3722,7 +3722,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" EndX=\"" << End.x <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" EndY=\"" << End.y <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\" EndZ=\"" << End.z <<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "\"/>" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "\"/>" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void GeomLineSegment::Restore (Base::XMLReader &reader)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/freecad/files/patch-src-Mod-Part-App-PropertyTopoShape.cpp.diff b/cad/freecad/files/patch-src-Mod-Part-App-PropertyTopoShape.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dbb6c454c37..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/freecad/files/patch-src-Mod-Part-App-PropertyTopoShape.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Mod/Part/App/PropertyTopoShape.cpp.orig 2019-10-22 11:53:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Mod/Part/App/PropertyTopoShape.cpp 2020-04-22 08:26:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -281,11 +281,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static Standard_Boolean BRepTools_Write(const TopoDS_Shape& Sh,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const Standard_CString File)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ofstream os;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::ofstream os;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if OCC_VERSION_HEX >= 0x060800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OSD_OpenStream(os, File, ios::out);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OSD_OpenStream(os, File, std::ios::out);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os.open(File, ios::out);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.open(File, std::ios::out);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!os.rdbuf()->is_open()) return Standard_False;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>