From 9ea0c30c4b7dff85bae42e8b5202d4fe68d23cc6 Mon Sep 17 00:00:00 2001 From: Debian Science Maintainers Date: Fri, 6 May 2011 14:52:41 +0100 Subject: [PATCH] compatibility-occ630-Value Temporarily push back methods which have been removed between 6.3.0 and 6.5.0 Many classes in OCC 6.3.O did provide a method Value(), which have been replaced by SquareDistance() in OCC 6.5.0. These methods seem to be commonly used, we provide a temporary alias to help smooth upgrades to 6.5.0. Few other aliases are also added, but note that this patch is transient and will be removed when all packages are ported to 6.5.0 Gbp-Pq: Name compatibility-occ630-Value.patch --- ros/inc/BRepExtrema_ExtCC.hxx | 4 ++++ ros/inc/BRepExtrema_ExtCF.hxx | 2 ++ ros/inc/BRepExtrema_ExtFF.hxx | 2 ++ ros/inc/BRepExtrema_ExtPC.hxx | 4 ++++ ros/inc/BRepExtrema_ExtPF.hxx | 2 ++ ros/inc/BRepMesh_DataStructureOfDelaun.hxx | 3 +++ ros/inc/Extrema_ECC2dOfExtCC2d.hxx | 2 ++ ros/inc/Extrema_ECCOfExtCC.hxx | 2 ++ ros/inc/Extrema_ELCC2dOfLocateExtCC2d.hxx | 2 ++ ros/inc/Extrema_ELCCOfLocateExtCC.hxx | 2 ++ ros/inc/Extrema_ELPCOfLocateExtPC.hxx | 4 ++++ ros/inc/Extrema_ELPCOfLocateExtPC2d.hxx | 4 ++++ ros/inc/Extrema_EPCOfELPCOfLocateExtPC.hxx | 2 ++ ros/inc/Extrema_EPCOfELPCOfLocateExtPC2d.hxx | 2 ++ ros/inc/Extrema_EPCOfExtPC.hxx | 2 ++ ros/inc/Extrema_EPCOfExtPC2d.hxx | 2 ++ ros/inc/Extrema_ExtCC.hxx | 4 ++++ ros/inc/Extrema_ExtCC2d.hxx | 4 ++++ ros/inc/Extrema_ExtCS.hxx | 2 ++ ros/inc/Extrema_ExtElC.hxx | 2 ++ ros/inc/Extrema_ExtElC2d.hxx | 2 ++ ros/inc/Extrema_ExtElCS.hxx | 2 ++ ros/inc/Extrema_ExtElSS.hxx | 2 ++ ros/inc/Extrema_ExtPC.hxx | 4 ++++ ros/inc/Extrema_ExtPC2d.hxx | 4 ++++ ros/inc/Extrema_ExtPElC.hxx | 2 ++ ros/inc/Extrema_ExtPElC2d.hxx | 2 ++ ros/inc/Extrema_ExtPElS.hxx | 2 ++ ros/inc/Extrema_ExtPExtS.hxx | 2 ++ ros/inc/Extrema_ExtPRevS.hxx | 2 ++ ros/inc/Extrema_ExtPS.hxx | 4 ++++ ros/inc/Extrema_ExtSS.hxx | 2 ++ ros/inc/Extrema_GenExtCS.hxx | 2 ++ ros/inc/Extrema_GenExtPS.hxx | 2 ++ ros/inc/Extrema_GenExtSS.hxx | 2 ++ ros/inc/Extrema_GenLocateExtCS.hxx | 2 ++ ros/inc/Extrema_GenLocateExtPS.hxx | 2 ++ ros/inc/Extrema_GenLocateExtSS.hxx | 2 ++ ros/inc/Extrema_LocECC2dOfLocateExtCC2d.hxx | 2 ++ ros/inc/Extrema_LocECCOfLocateExtCC.hxx | 2 ++ ros/inc/Extrema_LocEPCOfLocateExtPC.hxx | 2 ++ ros/inc/Extrema_LocEPCOfLocateExtPC2d.hxx | 2 ++ ros/inc/Extrema_LocateExtCC.hxx | 2 ++ ros/inc/Extrema_LocateExtCC2d.hxx | 2 ++ ros/inc/Extrema_LocateExtPC.hxx | 2 ++ ros/inc/Extrema_LocateExtPC2d.hxx | 2 ++ ros/inc/Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx | 2 ++ ros/inc/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx | 2 ++ ros/inc/Extrema_PCFOfEPCOfExtPC.hxx | 2 ++ ros/inc/Extrema_PCFOfEPCOfExtPC2d.hxx | 2 ++ ros/inc/Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx | 2 ++ ros/inc/Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx | 2 ++ .../Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter.hxx | 2 ++ ros/inc/Geom2dInt_TheLocateExtPCOfTheProjPCurOfGInter.hxx | 2 ++ .../HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter.hxx | 2 ++ ros/inc/HLRBRep_TheLocateExtPCOfTheProjPCurOfCInter.hxx | 2 ++ 56 files changed, 131 insertions(+) diff --git a/ros/inc/BRepExtrema_ExtCC.hxx b/ros/inc/BRepExtrema_ExtCC.hxx index 502675caf..314fffec7 100644 --- a/ros/inc/BRepExtrema_ExtCC.hxx +++ b/ros/inc/BRepExtrema_ExtCC.hxx @@ -90,6 +90,10 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been replaced by TrimmedSquareDistances(). Add an alias to not break existing code +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 { Standard_Real xdist11, xdistP12, xdistP21, xdistP22; TrimmedSquareDistances(xdist11, xdistP12, xdistP21, xdistP22, P11, P12, P21, P22); dist11=sqrt(xdist11); distP12=sqrt(xdistP12); distP21=sqrt(xdistP21); distP22=sqrt(xdistP22); } protected: diff --git a/ros/inc/BRepExtrema_ExtCF.hxx b/ros/inc/BRepExtrema_ExtCF.hxx index 8cc9abcf6..d19e7fd04 100644 --- a/ros/inc/BRepExtrema_ExtCF.hxx +++ b/ros/inc/BRepExtrema_ExtCF.hxx @@ -95,6 +95,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/BRepExtrema_ExtFF.hxx b/ros/inc/BRepExtrema_ExtFF.hxx index c6cb658a2..176acb0a8 100644 --- a/ros/inc/BRepExtrema_ExtFF.hxx +++ b/ros/inc/BRepExtrema_ExtFF.hxx @@ -91,6 +91,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/BRepExtrema_ExtPC.hxx b/ros/inc/BRepExtrema_ExtPC.hxx index 423d14316..9dfd0fd21 100644 --- a/ros/inc/BRepExtrema_ExtPC.hxx +++ b/ros/inc/BRepExtrema_ExtPC.hxx @@ -87,6 +87,10 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been replaced by TrimmedSquareDistances(). Add an alias to not break existing code +void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt& pnt1,gp_Pnt& pnt2) const { Standard_Real xdist1, xdist2; TrimmedSquareDistances(xdist1, xdist2, pnt1, pnt2); dist1 = sqrt(xdist1); dist2 = sqrt(xdist2); } protected: diff --git a/ros/inc/BRepExtrema_ExtPF.hxx b/ros/inc/BRepExtrema_ExtPF.hxx index 55c5afbca..6d04f595e 100644 --- a/ros/inc/BRepExtrema_ExtPF.hxx +++ b/ros/inc/BRepExtrema_ExtPF.hxx @@ -85,6 +85,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/BRepMesh_DataStructureOfDelaun.hxx b/ros/inc/BRepMesh_DataStructureOfDelaun.hxx index be0643eb8..c59dbd066 100644 --- a/ros/inc/BRepMesh_DataStructureOfDelaun.hxx +++ b/ros/inc/BRepMesh_DataStructureOfDelaun.hxx @@ -146,6 +146,9 @@ public: Standard_EXPORT const MeshDS_BaseAllocator& Allocator() const; +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, typos in ForseRemoveNode() and ForceRemoveLink() have been fixed. Add an alias to not break existing code +void ForseRemoveNode(const Standard_Integer Index) { ForceRemoveNode(Index); } +void ForseRemoveLink(const Standard_Integer Index) { ForceRemoveLink(Index); } DEFINE_STANDARD_RTTI(BRepMesh_DataStructureOfDelaun) diff --git a/ros/inc/Extrema_ECC2dOfExtCC2d.hxx b/ros/inc/Extrema_ECC2dOfExtCC2d.hxx index dbd0f1c6e..25245ef77 100644 --- a/ros/inc/Extrema_ECC2dOfExtCC2d.hxx +++ b/ros/inc/Extrema_ECC2dOfExtCC2d.hxx @@ -85,6 +85,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N = 1) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_ECCOfExtCC.hxx b/ros/inc/Extrema_ECCOfExtCC.hxx index ca58b880c..e8a2bccc6 100644 --- a/ros/inc/Extrema_ECCOfExtCC.hxx +++ b/ros/inc/Extrema_ECCOfExtCC.hxx @@ -85,6 +85,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N = 1) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_ELCC2dOfLocateExtCC2d.hxx b/ros/inc/Extrema_ELCC2dOfLocateExtCC2d.hxx index 0123e40cb..7736380a1 100644 --- a/ros/inc/Extrema_ELCC2dOfLocateExtCC2d.hxx +++ b/ros/inc/Extrema_ELCC2dOfLocateExtCC2d.hxx @@ -85,6 +85,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N = 1) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_ELCCOfLocateExtCC.hxx b/ros/inc/Extrema_ELCCOfLocateExtCC.hxx index 4b13d8718..90823bd33 100644 --- a/ros/inc/Extrema_ELCCOfLocateExtCC.hxx +++ b/ros/inc/Extrema_ELCCOfLocateExtCC.hxx @@ -85,6 +85,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N = 1) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_ELPCOfLocateExtPC.hxx b/ros/inc/Extrema_ELPCOfLocateExtPC.hxx index 47f1e3753..390268650 100644 --- a/ros/inc/Extrema_ELPCOfLocateExtPC.hxx +++ b/ros/inc/Extrema_ELPCOfLocateExtPC.hxx @@ -102,6 +102,10 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been replaced by TrimmedSquareDistances(). Add an alias to not break existing code +void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt& P1,gp_Pnt& P2) const { Standard_Real xdist1, xdist2; TrimmedSquareDistances(xdist1, xdist2, P1, P2); dist1 = sqrt(xdist1); dist2 = sqrt(xdist2); } protected: diff --git a/ros/inc/Extrema_ELPCOfLocateExtPC2d.hxx b/ros/inc/Extrema_ELPCOfLocateExtPC2d.hxx index 6e879fade..88624730c 100644 --- a/ros/inc/Extrema_ELPCOfLocateExtPC2d.hxx +++ b/ros/inc/Extrema_ELPCOfLocateExtPC2d.hxx @@ -102,6 +102,10 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been replaced by TrimmedSquareDistances(). Add an alias to not break existing code +void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt2d& P1,gp_Pnt2d& P2) const { Standard_Real xdist1, xdist2; TrimmedSquareDistances(xdist1, xdist2, P1, P2); dist1 = sqrt(xdist1); dist2 = sqrt(xdist2); } protected: diff --git a/ros/inc/Extrema_EPCOfELPCOfLocateExtPC.hxx b/ros/inc/Extrema_EPCOfELPCOfLocateExtPC.hxx index 7094a50ee..5995846e9 100644 --- a/ros/inc/Extrema_EPCOfELPCOfLocateExtPC.hxx +++ b/ros/inc/Extrema_EPCOfELPCOfLocateExtPC.hxx @@ -83,6 +83,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_EPCOfELPCOfLocateExtPC2d.hxx b/ros/inc/Extrema_EPCOfELPCOfLocateExtPC2d.hxx index 296115757..54025f001 100644 --- a/ros/inc/Extrema_EPCOfELPCOfLocateExtPC2d.hxx +++ b/ros/inc/Extrema_EPCOfELPCOfLocateExtPC2d.hxx @@ -83,6 +83,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_EPCOfExtPC.hxx b/ros/inc/Extrema_EPCOfExtPC.hxx index d6b35d3f1..f3106ba34 100644 --- a/ros/inc/Extrema_EPCOfExtPC.hxx +++ b/ros/inc/Extrema_EPCOfExtPC.hxx @@ -82,6 +82,8 @@ public: Standard_EXPORT Extrema_POnCurv Point(const Standard_Integer N) const; +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } diff --git a/ros/inc/Extrema_EPCOfExtPC2d.hxx b/ros/inc/Extrema_EPCOfExtPC2d.hxx index 507cab2db..4b8b037b6 100644 --- a/ros/inc/Extrema_EPCOfExtPC2d.hxx +++ b/ros/inc/Extrema_EPCOfExtPC2d.hxx @@ -82,6 +82,8 @@ public: Standard_EXPORT Extrema_POnCurv2d Point(const Standard_Integer N) const; +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } diff --git a/ros/inc/Extrema_ExtCC.hxx b/ros/inc/Extrema_ExtCC.hxx index 4497bab46..a094de2a4 100644 --- a/ros/inc/Extrema_ExtCC.hxx +++ b/ros/inc/Extrema_ExtCC.hxx @@ -104,6 +104,10 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N = 1) const { return sqrt(SquareDistance(N)); } +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been replaced by TrimmedSquareDistances(). Add an alias to not break existing code +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 { Standard_Real xdist11, xdistP12, xdistP21, xdistP22; TrimmedSquareDistances(xdist11, xdistP12, xdistP21, xdistP22, P11, P12, P21, P22); dist11 = sqrt(xdist11); xdistP12 = sqrt(distP12); distP21 = sqrt(xdistP21); distP22 = sqrt(xdistP22); } protected: diff --git a/ros/inc/Extrema_ExtCC2d.hxx b/ros/inc/Extrema_ExtCC2d.hxx index 0b1fb4ad3..1886b036a 100644 --- a/ros/inc/Extrema_ExtCC2d.hxx +++ b/ros/inc/Extrema_ExtCC2d.hxx @@ -92,6 +92,10 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N = 1) const { return sqrt(SquareDistance(N)); } +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been replaced by TrimmedSquareDistances(). Add an alias to not break existing code +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 { Standard_Real xdist11, xdistP12, xdistP21, xdistP22; TrimmedSquareDistances(xdist11, xdistP12, xdistP21, xdistP22, P11, P12, P21, P22); dist11 = sqrt(xdist11); xdistP12 = sqrt(distP12); distP21 = sqrt(xdistP21); distP22 = sqrt(xdistP22);} protected: diff --git a/ros/inc/Extrema_ExtCS.hxx b/ros/inc/Extrema_ExtCS.hxx index 6bd3e40c5..762efc7b9 100644 --- a/ros/inc/Extrema_ExtCS.hxx +++ b/ros/inc/Extrema_ExtCS.hxx @@ -95,6 +95,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_ExtElC.hxx b/ros/inc/Extrema_ExtElC.hxx index e4596dc88..aa933a3dd 100644 --- a/ros/inc/Extrema_ExtElC.hxx +++ b/ros/inc/Extrema_ExtElC.hxx @@ -117,6 +117,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N = 1) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_ExtElC2d.hxx b/ros/inc/Extrema_ExtElC2d.hxx index e5e95451a..d24a0c161 100644 --- a/ros/inc/Extrema_ExtElC2d.hxx +++ b/ros/inc/Extrema_ExtElC2d.hxx @@ -117,6 +117,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N = 1) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_ExtElCS.hxx b/ros/inc/Extrema_ExtElCS.hxx index 4a609b88c..7c4dae49e 100644 --- a/ros/inc/Extrema_ExtElCS.hxx +++ b/ros/inc/Extrema_ExtElCS.hxx @@ -139,6 +139,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N = 1) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_ExtElSS.hxx b/ros/inc/Extrema_ExtElSS.hxx index 64bf21cfb..4ede35d2d 100644 --- a/ros/inc/Extrema_ExtElSS.hxx +++ b/ros/inc/Extrema_ExtElSS.hxx @@ -106,6 +106,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N = 1) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_ExtPC.hxx b/ros/inc/Extrema_ExtPC.hxx index 6ba5b1acb..823b01f99 100644 --- a/ros/inc/Extrema_ExtPC.hxx +++ b/ros/inc/Extrema_ExtPC.hxx @@ -102,6 +102,10 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been replaced by TrimmedSquareDistances(). Add an alias to not break existing code +void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt& P1,gp_Pnt& P2) const { Standard_Real xdist1, xdist2; TrimmedSquareDistances(xdist1, xdist2, P1, P2); dist1 = sqrt(xdist1); dist2 = sqrt(xdist2); } protected: diff --git a/ros/inc/Extrema_ExtPC2d.hxx b/ros/inc/Extrema_ExtPC2d.hxx index 7add13d71..3632fa7d4 100644 --- a/ros/inc/Extrema_ExtPC2d.hxx +++ b/ros/inc/Extrema_ExtPC2d.hxx @@ -102,6 +102,10 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been replaced by TrimmedSquareDistances(). Add an alias to not break existing code +void TrimmedDistances(Standard_Real& dist1,Standard_Real& dist2,gp_Pnt2d& P1,gp_Pnt2d& P2) const { Standard_Real xdist1, xdist2; TrimmedSquareDistances(xdist1, xdist2, P1, P2); dist1 = sqrt(xdist1); dist2 = sqrt(xdist2); } protected: diff --git a/ros/inc/Extrema_ExtPElC.hxx b/ros/inc/Extrema_ExtPElC.hxx index c6befc1dc..db07647a9 100644 --- a/ros/inc/Extrema_ExtPElC.hxx +++ b/ros/inc/Extrema_ExtPElC.hxx @@ -123,6 +123,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_ExtPElC2d.hxx b/ros/inc/Extrema_ExtPElC2d.hxx index 6d7e6b622..c06ca7f5c 100644 --- a/ros/inc/Extrema_ExtPElC2d.hxx +++ b/ros/inc/Extrema_ExtPElC2d.hxx @@ -123,6 +123,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_ExtPElS.hxx b/ros/inc/Extrema_ExtPElS.hxx index 7be102c5b..24f6bb8a6 100644 --- a/ros/inc/Extrema_ExtPElS.hxx +++ b/ros/inc/Extrema_ExtPElS.hxx @@ -99,6 +99,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_ExtPExtS.hxx b/ros/inc/Extrema_ExtPExtS.hxx index 25d45bab7..ed1850a36 100644 --- a/ros/inc/Extrema_ExtPExtS.hxx +++ b/ros/inc/Extrema_ExtPExtS.hxx @@ -94,6 +94,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_ExtPRevS.hxx b/ros/inc/Extrema_ExtPRevS.hxx index 6044e3220..1b4b82cbb 100644 --- a/ros/inc/Extrema_ExtPRevS.hxx +++ b/ros/inc/Extrema_ExtPRevS.hxx @@ -83,6 +83,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_ExtPS.hxx b/ros/inc/Extrema_ExtPS.hxx index 9ba61b246..119bc9f65 100644 --- a/ros/inc/Extrema_ExtPS.hxx +++ b/ros/inc/Extrema_ExtPS.hxx @@ -117,6 +117,10 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N = 1) const { return sqrt(SquareDistance(N)); } +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, TrimmedDistances() has been replaced by TrimmedSquareDistances(). Add an alias to not break existing code +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 { Standard_Real xdUfVf, xdUfVl, xdUlVf, xdUlVl; TrimmedSquareDistances(xdUfVf, xdUfVl, xdUlVf, xdUlVl, PUfVf, PUfVl, PUlVf, PUlVl); dUfVf = sqrt(xdUfVf); dUfVl = sqrt(xdUfVl); dUlVf = sqrt(xdUlVf); dUlVl = sqrt(xdUlVl); } protected: diff --git a/ros/inc/Extrema_ExtSS.hxx b/ros/inc/Extrema_ExtSS.hxx index 9b6a80704..b685c0bbf 100644 --- a/ros/inc/Extrema_ExtSS.hxx +++ b/ros/inc/Extrema_ExtSS.hxx @@ -88,6 +88,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_GenExtCS.hxx b/ros/inc/Extrema_GenExtCS.hxx index 0798ddf24..5d652270b 100644 --- a/ros/inc/Extrema_GenExtCS.hxx +++ b/ros/inc/Extrema_GenExtCS.hxx @@ -110,6 +110,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_GenExtPS.hxx b/ros/inc/Extrema_GenExtPS.hxx index 628a400ca..f77a9eec9 100644 --- a/ros/inc/Extrema_GenExtPS.hxx +++ b/ros/inc/Extrema_GenExtPS.hxx @@ -106,6 +106,8 @@ public: +// DEBIAN SPECIFIC CHANGE: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_GenExtSS.hxx b/ros/inc/Extrema_GenExtSS.hxx index f0332842e..0e999368e 100644 --- a/ros/inc/Extrema_GenExtSS.hxx +++ b/ros/inc/Extrema_GenExtSS.hxx @@ -101,6 +101,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_GenLocateExtCS.hxx b/ros/inc/Extrema_GenLocateExtCS.hxx index 499e1d561..5d461eeb3 100644 --- a/ros/inc/Extrema_GenLocateExtCS.hxx +++ b/ros/inc/Extrema_GenLocateExtCS.hxx @@ -74,6 +74,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value() const { return sqrt(SquareDistance()); } protected: diff --git a/ros/inc/Extrema_GenLocateExtPS.hxx b/ros/inc/Extrema_GenLocateExtPS.hxx index 7abd6cd7a..c61bd117f 100644 --- a/ros/inc/Extrema_GenLocateExtPS.hxx +++ b/ros/inc/Extrema_GenLocateExtPS.hxx @@ -66,6 +66,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value() const { return sqrt(SquareDistance()); } protected: diff --git a/ros/inc/Extrema_GenLocateExtSS.hxx b/ros/inc/Extrema_GenLocateExtSS.hxx index 84ffda49b..591ec6a69 100644 --- a/ros/inc/Extrema_GenLocateExtSS.hxx +++ b/ros/inc/Extrema_GenLocateExtSS.hxx @@ -69,6 +69,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value() const { return sqrt(SquareDistance()); } protected: diff --git a/ros/inc/Extrema_LocECC2dOfLocateExtCC2d.hxx b/ros/inc/Extrema_LocECC2dOfLocateExtCC2d.hxx index a32d0a8f5..e6489e6d1 100644 --- a/ros/inc/Extrema_LocECC2dOfLocateExtCC2d.hxx +++ b/ros/inc/Extrema_LocECC2dOfLocateExtCC2d.hxx @@ -61,6 +61,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value() const { return sqrt(SquareDistance()); } protected: diff --git a/ros/inc/Extrema_LocECCOfLocateExtCC.hxx b/ros/inc/Extrema_LocECCOfLocateExtCC.hxx index bd9ddc398..b03afd59f 100644 --- a/ros/inc/Extrema_LocECCOfLocateExtCC.hxx +++ b/ros/inc/Extrema_LocECCOfLocateExtCC.hxx @@ -61,6 +61,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value() const { return sqrt(SquareDistance()); } protected: diff --git a/ros/inc/Extrema_LocEPCOfLocateExtPC.hxx b/ros/inc/Extrema_LocEPCOfLocateExtPC.hxx index d41d7b0a5..c6058a554 100644 --- a/ros/inc/Extrema_LocEPCOfLocateExtPC.hxx +++ b/ros/inc/Extrema_LocEPCOfLocateExtPC.hxx @@ -72,6 +72,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value() const { return sqrt(SquareDistance()); } protected: diff --git a/ros/inc/Extrema_LocEPCOfLocateExtPC2d.hxx b/ros/inc/Extrema_LocEPCOfLocateExtPC2d.hxx index fb0284a52..1251e8a21 100644 --- a/ros/inc/Extrema_LocEPCOfLocateExtPC2d.hxx +++ b/ros/inc/Extrema_LocEPCOfLocateExtPC2d.hxx @@ -72,6 +72,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value() const { return sqrt(SquareDistance()); } protected: diff --git a/ros/inc/Extrema_LocateExtCC.hxx b/ros/inc/Extrema_LocateExtCC.hxx index 6d2e86605..684398a2d 100644 --- a/ros/inc/Extrema_LocateExtCC.hxx +++ b/ros/inc/Extrema_LocateExtCC.hxx @@ -65,6 +65,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value() const { return sqrt(SquareDistance()); } protected: diff --git a/ros/inc/Extrema_LocateExtCC2d.hxx b/ros/inc/Extrema_LocateExtCC2d.hxx index a1fa7eb29..370e01ef9 100644 --- a/ros/inc/Extrema_LocateExtCC2d.hxx +++ b/ros/inc/Extrema_LocateExtCC2d.hxx @@ -65,6 +65,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value() const { return sqrt(SquareDistance()); } protected: diff --git a/ros/inc/Extrema_LocateExtPC.hxx b/ros/inc/Extrema_LocateExtPC.hxx index ec59462a1..3634c6558 100644 --- a/ros/inc/Extrema_LocateExtPC.hxx +++ b/ros/inc/Extrema_LocateExtPC.hxx @@ -90,6 +90,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value() const { return sqrt(SquareDistance()); } protected: diff --git a/ros/inc/Extrema_LocateExtPC2d.hxx b/ros/inc/Extrema_LocateExtPC2d.hxx index de84f93f4..5518689d1 100644 --- a/ros/inc/Extrema_LocateExtPC2d.hxx +++ b/ros/inc/Extrema_LocateExtPC2d.hxx @@ -91,6 +91,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value() const { return sqrt(SquareDistance()); } protected: diff --git a/ros/inc/Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx b/ros/inc/Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx index dfc5bce76..ac561ce16 100644 --- a/ros/inc/Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx +++ b/ros/inc/Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx @@ -98,6 +98,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx b/ros/inc/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx index c7d8a917b..57bc31caf 100644 --- a/ros/inc/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx +++ b/ros/inc/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx @@ -98,6 +98,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_PCFOfEPCOfExtPC.hxx b/ros/inc/Extrema_PCFOfEPCOfExtPC.hxx index 89e87c4fd..4f4dbc966 100644 --- a/ros/inc/Extrema_PCFOfEPCOfExtPC.hxx +++ b/ros/inc/Extrema_PCFOfEPCOfExtPC.hxx @@ -98,6 +98,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_PCFOfEPCOfExtPC2d.hxx b/ros/inc/Extrema_PCFOfEPCOfExtPC2d.hxx index 3ddd0aecd..062673b7e 100644 --- a/ros/inc/Extrema_PCFOfEPCOfExtPC2d.hxx +++ b/ros/inc/Extrema_PCFOfEPCOfExtPC2d.hxx @@ -98,6 +98,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx b/ros/inc/Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx index 2b23d7a12..9757a28ad 100644 --- a/ros/inc/Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx +++ b/ros/inc/Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx @@ -98,6 +98,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx b/ros/inc/Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx index b6125a97d..749c632f8 100644 --- a/ros/inc/Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx +++ b/ros/inc/Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx @@ -98,6 +98,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter.hxx b/ros/inc/Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter.hxx index 1d4ef4c55..5e92d4daf 100644 --- a/ros/inc/Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter.hxx +++ b/ros/inc/Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter.hxx @@ -98,6 +98,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/Geom2dInt_TheLocateExtPCOfTheProjPCurOfGInter.hxx b/ros/inc/Geom2dInt_TheLocateExtPCOfTheProjPCurOfGInter.hxx index 899cbc71b..e1dcca82a 100644 --- a/ros/inc/Geom2dInt_TheLocateExtPCOfTheProjPCurOfGInter.hxx +++ b/ros/inc/Geom2dInt_TheLocateExtPCOfTheProjPCurOfGInter.hxx @@ -72,6 +72,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value() const { return sqrt(SquareDistance()); } protected: diff --git a/ros/inc/HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter.hxx b/ros/inc/HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter.hxx index 9b62d4813..8cde131ac 100644 --- a/ros/inc/HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter.hxx +++ b/ros/inc/HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter.hxx @@ -97,6 +97,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value(const Standard_Integer N) const { return sqrt(SquareDistance(N)); } protected: diff --git a/ros/inc/HLRBRep_TheLocateExtPCOfTheProjPCurOfCInter.hxx b/ros/inc/HLRBRep_TheLocateExtPCOfTheProjPCurOfCInter.hxx index 7f9e7a53c..7a8777d96 100644 --- a/ros/inc/HLRBRep_TheLocateExtPCOfTheProjPCurOfCInter.hxx +++ b/ros/inc/HLRBRep_TheLocateExtPCOfTheProjPCurOfCInter.hxx @@ -74,6 +74,8 @@ public: +// DEBIAN SPECIFIC CHANGES: In OCC 6.5.0, Value() has been replaced by SquareDistance(). Add an alias to not break existing code +Standard_Real Value() const { return sqrt(SquareDistance()); } protected: -- 2.30.2