Merge branch 'OCCT780'

diff --git a/src/Basics/smIdType.hxx.in b/src/Basics/smIdType.hxx.in
index 4ad268d72577690a54051a3cd7d61ff1e0e9569a..d1b3e9e61ba6a554c82181070089e2b48c461e67 100644 (file)
--- 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 <cinttypes>
+#include <cstddef>
 #include <limits>
 
 #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<int> ((theValue & std::numeric_limits<smIdType>::max()) % theUpperBound + 1);
@@ -45,6 +49,16 @@ struct smIdHasher
   {
     return id1 == id2;
   }
+#else
+  size_t operator()(const smIdType theValue) const
+  {
+    return static_cast<size_t> (theValue & std::numeric_limits<smIdType>::max());
+  }
+  bool operator()(const smIdType& theValue1, const smIdType& theValue2) const
+  {
+    return theValue1 == theValue2;
+  }
+#endif
 };
 
 template <class T> inline smIdType ToSmIdType(T val)

diff --git a/src/ResourcesManager/CMakeLists.txt b/src/ResourcesManager/CMakeLists.txt
index de36aae75bb3da3db29c246df66b88047a9ad543..34f6e1259e54c632a9a604b78875bc26efb6644a 100644 (file)
--- a/src/ResourcesManager/CMakeLists.txt
+++ b/src/ResourcesManager/CMakeLists.txt
@@ -18,15 +18,15 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${LIBXML2_INCLUDE_DIR}
-  ${PTHREAD_INCLUDE_DIR}
-  ${OMNIORB_INCLUDE_DIR}
-  ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
   ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService
   ${CMAKE_CURRENT_SOURCE_DIR}/../Utils
   ${PROJECT_BINARY_DIR}/idl
+  ${LIBXML2_INCLUDE_DIR}
+  ${PTHREAD_INCLUDE_DIR}
+  ${OMNIORB_INCLUDE_DIR}
+  ${PROJECT_BINARY_DIR}/salome_adm
 )
 
 

diff --git a/src/SALOMELocalTrace/CMakeLists.txt b/src/SALOMELocalTrace/CMakeLists.txt
index 4f03d0a0422606c9d41097f8514c6e4bacc2598c..5372a796864034514025ec31150038eeb0ccec10 100644 (file)
--- a/src/SALOMELocalTrace/CMakeLists.txt
+++ b/src/SALOMELocalTrace/CMakeLists.txt
@@ -18,7 +18,6 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${PTHREAD_INCLUDE_DIR}
 )

diff --git a/src/SALOMELocalTrace/Test/CMakeLists.txt b/src/SALOMELocalTrace/Test/CMakeLists.txt
index ae74f1419644636711456aaeb67d2c2f3d1dc6b7..990bea6295b770d5edb4590810b83b18755204ae 100644 (file)
--- a/src/SALOMELocalTrace/Test/CMakeLists.txt
+++ b/src/SALOMELocalTrace/Test/CMakeLists.txt
@@ -18,11 +18,11 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${CPPUNIT_INCLUDE_DIRS}
-  ${PTHREAD_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test
   ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace
+  ${CPPUNIT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
 )
 
 ADD_DEFINITIONS(${CPPUNIT_DEFINITIONS})

diff --git a/src/SALOMETraceCollector/CMakeLists.txt b/src/SALOMETraceCollector/CMakeLists.txt
index 60630e98702a30fc575443db4894c388f5f599da..12fef2047c4e8eb14bc1472daae7b132599d226e 100644 (file)
--- a/src/SALOMETraceCollector/CMakeLists.txt
+++ b/src/SALOMETraceCollector/CMakeLists.txt
@@ -18,17 +18,16 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDE_DIR}
-  ${PTHREAD_INCLUDE_DIR}
-  ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../ArgvKeeper
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../Utils
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
-  ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService
   ${CMAKE_CURRENT_SOURCE_DIR}/../Logger
   ${PROJECT_BINARY_DIR}/idl
+  ${OMNIORB_INCLUDE_DIR}
+  ${PTHREAD_INCLUDE_DIR}
+  ${PROJECT_BINARY_DIR}/salome_adm
 )
 
 ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${PTHREAD_DEFINITIONS})

diff --git a/src/SALOMETraceCollector/Test/CMakeLists.txt b/src/SALOMETraceCollector/Test/CMakeLists.txt
index 00a6fa0b002573042569ec3a9916f84732fbd5bb..5417cfb1e93d9c2883067c51cb6b939179a2e531 100644 (file)
--- a/src/SALOMETraceCollector/Test/CMakeLists.txt
+++ b/src/SALOMETraceCollector/Test/CMakeLists.txt
@@ -18,13 +18,13 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${CPPUNIT_INCLUDE_DIRS}
-  ${PTHREAD_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test
   ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace
   ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace/Test
   ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMETraceCollector
+  ${CPPUNIT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
 )
 
 SET(COMMON_LIBS

diff --git a/src/TOOLSDS/CMakeLists.txt b/src/TOOLSDS/CMakeLists.txt
index c5bede84be94f62f2b26347f6accff27ba632f2b..54d3c004047bbba4892f53e0ef5bd7650edd3729 100644 (file)
--- a/src/TOOLSDS/CMakeLists.txt
+++ b/src/TOOLSDS/CMakeLists.txt
@@ -18,15 +18,15 @@
 #
 
 INCLUDE_DIRECTORIES(
+  ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Utils
+  ${PROJECT_BINARY_DIR}/idl
   ${OMNIORB_INCLUDE_DIR}
   ${HDF5_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/salome_adm
-  ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
-  ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
-  ${CMAKE_CURRENT_SOURCE_DIR}/../Utils
-  ${PROJECT_BINARY_DIR}/idl
 )
 
 ADD_LIBRARY(TOOLSDS SALOMEDS_Tool.cxx)

diff --git a/src/TestContainer/CMakeLists.txt b/src/TestContainer/CMakeLists.txt
index 6b2c63cf9e385a87aea718a2ef34753935c39d72..e78ca116eb7dfbfee4ee69599ee34d938e9a0739 100644 (file)
--- a/src/TestContainer/CMakeLists.txt
+++ b/src/TestContainer/CMakeLists.txt
@@ -18,9 +18,6 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIR}
-  ${OMNIORB_INCLUDE_DIR}
-  ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../ArgvKeeper
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
@@ -32,6 +29,9 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../Container
   ${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj
   ${PROJECT_BINARY_DIR}/idl
+  ${PTHREAD_INCLUDE_DIR}
+  ${OMNIORB_INCLUDE_DIR}
+  ${PROJECT_BINARY_DIR}/salome_adm
 )
 
 SET(SalomeTestComponentEngine_SOURCES

diff --git a/src/TestMPIContainer/CMakeLists.txt b/src/TestMPIContainer/CMakeLists.txt
index 81c402d29b2da682c35b73ccdd8c48ae7762e9e5..204269539a6f49f7f2e3dee9b3be357c14e7d1ff 100644 (file)
--- a/src/TestMPIContainer/CMakeLists.txt
+++ b/src/TestMPIContainer/CMakeLists.txt
@@ -18,9 +18,6 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${MPI_CXX_INCLUDE_PATH}
-  ${OMNIORB_INCLUDE_DIR}
-  ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../ArgvKeeper
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
@@ -33,6 +30,9 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../MPIContainer
   ${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj
   ${PROJECT_BINARY_DIR}/idl
+  ${MPI_CXX_INCLUDE_PATH}
+  ${OMNIORB_INCLUDE_DIR}
+  ${PROJECT_BINARY_DIR}/salome_adm
 )
 
 ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${MPI_DEFINITIONS})

diff --git a/src/UnitTests/CMakeLists.txt b/src/UnitTests/CMakeLists.txt
index 15057a4c11cefacc82acdf8b62ab7bfa8d907879..9978d708f6467c68487fbd0f9cb99dabe7153962 100644 (file)
--- a/src/UnitTests/CMakeLists.txt
+++ b/src/UnitTests/CMakeLists.txt
@@ -18,13 +18,13 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${CPPUNIT_INCLUDE_DIRS}
-  ${PTHREAD_INCLUDE_DIR}
-  ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics/Test
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace/Test
+  ${CPPUNIT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
+  ${PROJECT_BINARY_DIR}/salome_adm
 )
 
 # ===============================================================

diff --git a/src/Utils/CMakeLists.txt b/src/Utils/CMakeLists.txt
index 1c923ca2245ec4a07043312d1eb1803cd2c8d14d..26f9560bb82de6519b82a0375589baa38b3b034f 100644 (file)
--- a/src/Utils/CMakeLists.txt
+++ b/src/Utils/CMakeLists.txt
@@ -20,14 +20,14 @@
 IF(NOT SALOME_LIGHT_ONLY)
 
   INCLUDE_DIRECTORIES(
-    ${OMNIORB_INCLUDE_DIR}
-    ${PTHREAD_INCLUDE_DIR}
-    ${PROJECT_BINARY_DIR}/salome_adm
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../ArgvKeeper
     ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
     ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
     ${PROJECT_BINARY_DIR}/idl
+    ${OMNIORB_INCLUDE_DIR}
+    ${PTHREAD_INCLUDE_DIR}
+    ${PROJECT_BINARY_DIR}/salome_adm
   )
   ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${PTHREAD_DEFINITIONS})
   SET(COMMON_LIBS
@@ -54,12 +54,12 @@ IF(NOT SALOME_LIGHT_ONLY)
 ELSE()
 
   INCLUDE_DIRECTORIES(
-    ${PTHREAD_INCLUDE_DIR}
-    ${PROJECT_BINARY_DIR}/salome_adm
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../ArgvKeeper
     ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
     ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
+    ${PTHREAD_INCLUDE_DIR}
+    ${PROJECT_BINARY_DIR}/salome_adm
   )
   SET(COMMON_LIBS
     ArgvKeeper

diff --git a/src/Utils/Test/CMakeLists.txt b/src/Utils/Test/CMakeLists.txt
index 70f06e7ec2c0ef71ffb887d2063fc784804b3c1f..08c26b9dc3b0cd14ad81ad4dc0c1c7aa1ae2c97f 100644 (file)
--- a/src/Utils/Test/CMakeLists.txt
+++ b/src/Utils/Test/CMakeLists.txt
@@ -18,8 +18,6 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIR}
-  ${CPPUNIT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test
   ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace
@@ -28,6 +26,8 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMETraceCollector/Test
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Utils
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Utils/Test
+  ${PTHREAD_INCLUDE_DIR}
+  ${CPPUNIT_INCLUDE_DIRS}
 )
 
 SET(COMMON_LIBS