From 2f9f8ec18fd01dbcf2c6165e9fac95cc4b5dbad5 Mon Sep 17 00:00:00 2001 From: jfa Date: Mon, 15 Jan 2024 13:31:55 +0000 Subject: [PATCH] Porting to OCCT 7.8.0 --- src/Basics/smIdType.hxx.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/Basics/smIdType.hxx.in b/src/Basics/smIdType.hxx.in index 6950ed1bd..b791360b6 100644 --- a/src/Basics/smIdType.hxx.in +++ b/src/Basics/smIdType.hxx.in @@ -25,7 +25,10 @@ #cmakedefine SALOME_USE_64BIT_IDS +#include "Basics_OCCTVersion.hxx" + #include +#include #include #ifndef SALOME_USE_64BIT_IDS @@ -36,6 +39,7 @@ typedef std::int64_t smIdType; struct smIdHasher { +#if OCC_VERSION_LARGE < 0x07080000 static int HashCode(const smIdType theValue, const int theUpperBound) { return static_cast ((theValue & std::numeric_limits::max()) % theUpperBound + 1); @@ -45,6 +49,16 @@ struct smIdHasher { return id1 == id2; } +#else + size_t operator()(const smIdType theValue) const + { + return static_cast (theValue & std::numeric_limits::max()); + } + bool operator()(const smIdType& theValue1, const smIdType& theValue2) const + { + return theValue1 == theValue2; + } +#endif }; template inline smIdType ToSmIdType(T val) -- 2.39.2