From 1f6c14bfc3cc7794665985caf9e6cd492757eb08 Mon Sep 17 00:00:00 2001 From: jfa Date: Mon, 15 Jan 2024 14:28:30 +0000 Subject: [PATCH] Porting to OCCT 7.8.0 --- src/NETGENPlugin/NETGENPlugin_Mesher.cxx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx index efa5e70..02d4332 100644 --- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx @@ -154,16 +154,27 @@ namespace { return (( Contains( other.n1 ) || Contains( other.n2 )) && ( this != &other )); } +#if OCC_VERSION_LARGE < 0x07080000 static int HashCode(const Link& aLink, int aLimit) { return ::HashCode(aLink.n1 + aLink.n2, aLimit); } - static Standard_Boolean IsEqual(const Link& aLink1, const Link& aLink2) { return (( aLink1.n1 == aLink2.n1 && aLink1.n2 == aLink2.n2 ) || ( aLink1.n1 == aLink2.n2 && aLink1.n2 == aLink2.n1 )); } +#else + size_t operator()(const Link& aLink) const + { + return static_cast(aLink.n1 + aLink.n2); + } + bool operator()(const Link& aLink1, const Link& aLink2) const + { + return (( aLink1.n1 == aLink2.n1 && aLink1.n2 == aLink2.n2 ) || + ( aLink1.n1 == aLink2.n2 && aLink1.n2 == aLink2.n1 )); + } +#endif }; typedef NCollection_Map TLinkMap;