Hi again,
I just found that current tree does not compile because of one of my
patches, I do not know why I did not detect this problem earlier.
Here is a fix I am currently testing and will commit later today, feel
free to commit it if you want.
Denis
diff --git a/debian/patches/compatibility-occ630-Value.patch b/debian/patches/compatibility-occ630-Value.patch
index 216d052..622cdf4 100644
--- a/debian/patches/compatibility-occ630-Value.patch
+++ b/debian/patches/compatibility-occ630-Value.patch
@@ -33,7 +33,7 @@ Index: opencascade/ros/inc/BRepExtrema_ExtCC.hxx
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been renamed into SquareDistance(). Add an alias to not break existing code
+Standard_EXPORT Standard_Real Value(const Standard_Integer N) const { return SquareDistance(N); }
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been renamed into TrimmedSquareDistances(). Add an alias to not break existing code
-+Standard_EXPORT void TrimmedDistances(Standard_Real& dist11,Standard_Real& distP12,Standard_Real& distP21,Standard_Real& distP22,gp_Pnt& P11,gp_Pnt& P12,gp_Pnt& P21,gp_Pnt& P22) const { return TrimmedSquareDistances(dist11, distP12, distP21, distP22, P11, P12, P21, P22) ;}
++Standard_EXPORT void TrimmedDistances(Standard_Real& dist11,Standard_Real& distP12,Standard_Real& distP21,Standard_Real& distP22,gp_Pnt& P11,gp_Pnt& P12,gp_Pnt& P21,gp_Pnt& P22) const { TrimmedSquareDistances(dist11, distP12, distP21, distP22, P11, P12, P21, P22) ;}
protected:
@@ -74,7 +74,7 @@ Index: opencascade/ros/inc/BRepExtrema_ExtPC.hxx
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been renamed into SquareDistance(). Add an alias to not break existing code
+Standard_EXPORT Standard_Real Value(const Standard_Integer N) const { return SquareDistance(N); }
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been renamed into TrimmedSquareDistances(). Add an alias to not break existing code
-+Standard_EXPORT void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt& pnt1,gp_Pnt& pnt2) const { return TrimmedSquareDistances(dist1, dist2, pnt1, pnt2) ;}
++Standard_EXPORT void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt& pnt1,gp_Pnt& pnt2) const { TrimmedSquareDistances(dist1, dist2, pnt1, pnt2) ;}
protected:
@@ -168,7 +168,7 @@ Index: opencascade/ros/inc/Extrema_ELPCOfLocateExtPC.hxx
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been renamed into SquareDistance(). Add an alias to not break existing code
+Standard_EXPORT Standard_Real Value(const Standard_Integer N) const { return SquareDistance(N); }
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been renamed into TrimmedSquareDistances(). Add an alias to not break existing code
-+Standard_EXPORT void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt& P1,gp_Pnt& P2) const { return TrimmedSquareDistances(dist1, dist2, P1, P2) ;}
++Standard_EXPORT void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt& P1,gp_Pnt& P2) const { TrimmedSquareDistances(dist1, dist2, P1, P2) ;}
protected:
@@ -183,7 +183,7 @@ Index: opencascade/ros/inc/Extrema_ELPCOfLocateExtPC2d.hxx
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been renamed into SquareDistance(). Add an alias to not break existing code
+Standard_EXPORT Standard_Real Value(const Standard_Integer N) const { return SquareDistance(N); }
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been renamed into TrimmedSquareDistances(). Add an alias to not break existing code
-+Standard_EXPORT void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt& P1,gp_Pnt& P2) const { return TrimmedSquareDistances(dist1, dist2, P1, P2) ;}
++Standard_EXPORT void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt2d& P1,gp_Pnt2d& P2) const { TrimmedSquareDistances(dist1, dist2, P1, P2) ;}
protected:
@@ -250,7 +250,7 @@ Index: opencascade/ros/inc/Extrema_ExtCC.hxx
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been renamed into SquareDistance(). Add an alias to not break existing code
+Standard_EXPORT Standard_Real Value(const Standard_Integer N = 1) const { return SquareDistance(N); }
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been renamed into TrimmedSquareDistances(). Add an alias to not break existing code
-+Standard_EXPORT void TrimmedDistances(Standard_Real& dist11,Standard_Real& distP12,Standard_Real& distP21,Standard_Real& distP22,gp_Pnt2d& P11,gp_Pnt2d& P12,gp_Pnt2d& P21,gp_Pnt2d& P22) const { return TrimmedSquareDistances(dist11, distP12, distP21, distP22, P11, P12, P21, P22) ;}
++Standard_EXPORT void TrimmedDistances(Standard_Real& dist11,Standard_Real& distP12,Standard_Real& distP21,Standard_Real& distP22,gp_Pnt& P11,gp_Pnt& P12,gp_Pnt& P21,gp_Pnt& P22) const { TrimmedSquareDistances(dist11, distP12, distP21, distP22, P11, P12, P21, P22) ;}
protected:
@@ -265,7 +265,7 @@ Index: opencascade/ros/inc/Extrema_ExtCC2d.hxx
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been renamed into SquareDistance(). Add an alias to not break existing code
+Standard_EXPORT Standard_Real Value(const Standard_Integer N = 1) const { return SquareDistance(N); }
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been renamed into TrimmedSquareDistances(). Add an alias to not break existing code
-+Standard_EXPORT void TrimmedDistances(Standard_Real& dist11,Standard_Real& distP12,Standard_Real& distP21,Standard_Real& distP22,gp_Pnt2d& P11,gp_Pnt2d& P12,gp_Pnt2d& P21,gp_Pnt2d& P22) const { return TrimmedSquareDistances(dist11, distP12, distP21, distP22, P11, P12, P21, P22) ;}
++Standard_EXPORT void TrimmedDistances(Standard_Real& dist11,Standard_Real& distP12,Standard_Real& distP21,Standard_Real& distP22,gp_Pnt2d& P11,gp_Pnt2d& P12,gp_Pnt2d& P21,gp_Pnt2d& P22) const { TrimmedSquareDistances(dist11, distP12, distP21, distP22, P11, P12, P21, P22) ;}
protected:
@@ -345,7 +345,7 @@ Index: opencascade/ros/inc/Extrema_ExtPC.hxx
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been renamed into SquareDistance(). Add an alias to not break existing code
+Standard_EXPORT Standard_Real Value(const Standard_Integer N) const { return SquareDistance(N); }
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been renamed into TrimmedSquareDistances(). Add an alias to not break existing code
-+Standard_EXPORT void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt2d& P1,gp_Pnt2d& P2) const { return TrimmedSquareDistances(dist1, dist2, P1, P2); }
++Standard_EXPORT void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt& P1,gp_Pnt& P2) const { TrimmedSquareDistances(dist1, dist2, P1, P2); }
protected:
@@ -360,7 +360,7 @@ Index: opencascade/ros/inc/Extrema_ExtPC2d.hxx
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been renamed into SquareDistance(). Add an alias to not break existing code
+Standard_EXPORT Standard_Real Value(const Standard_Integer N) const { return SquareDistance(N); }
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been renamed into TrimmedSquareDistances(). Add an alias to not break existing code
-+Standard_EXPORT void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt2d& P1,gp_Pnt2d& P2) const { return TrimmedSquareDistances(dist1, dist2, P1, P2); }
++Standard_EXPORT void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt2d& P1,gp_Pnt2d& P2) const { TrimmedSquareDistances(dist1, dist2, P1, P2); }
protected:
@@ -440,7 +440,7 @@ Index: opencascade/ros/inc/Extrema_ExtPS.hxx
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been renamed into SquareDistance(). Add an alias to not break existing code
+Standard_EXPORT Standard_Real Value(const Standard_Integer N = 1) const { return SquareDistance(N); }
+// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been renamed into TrimmedSquareDistances(). Add an alias to not break existing code
-+Standard_EXPORT void TrimmedDistances(Standard_Real& dUfVf,Standard_Real& dUfVl,Standard_Real& dUlVf,Standard_Real& dUlVl,gp_Pnt& PUfVf,gp_Pnt& PUfVl,gp_Pnt& PUlVf,gp_Pnt& PUlVl) const { return TrimmedSquareDistances(dUfVf, dUfVl, dUlVf, dUlVl, PUfVf, PUfVl, PUlVf, PUlVl); }
++Standard_EXPORT void TrimmedDistances(Standard_Real& dUfVf,Standard_Real& dUfVl,Standard_Real& dUlVf,Standard_Real& dUlVl,gp_Pnt& PUfVf,gp_Pnt& PUfVl,gp_Pnt& PUlVf,gp_Pnt& PUlVl) const { TrimmedSquareDistances(dUfVf, dUfVl, dUlVf, dUlVl, PUfVf, PUfVl, PUlVf, PUlVl); }
protected:
