Fix compilation errors

diff --git a/doc/salome/gui/GEOM/CMakeLists.txt b/doc/salome/gui/GEOM/CMakeLists.txt
index 66dfa624e0dda956645c3d3406322e1451e42136..3fe599dc5ba9146b0222689984ed005b011236ab 100644 (file)
--- a/doc/salome/gui/GEOM/CMakeLists.txt
+++ b/doc/salome/gui/GEOM/CMakeLists.txt
@@ -61,7 +61,7 @@ ADD_CUSTOM_TARGET(usr_docs ${CMAKE_COMMAND} -E make_directory tmp
   COMMAND ${CMAKE_COMMAND} -E make_directory tmp1
   COMMAND ${PYTHON_EXECUTABLE} ${f} -o tmp/geomBuilder.py     ${CMAKE_SOURCE_DIR}/src/GEOM_SWIG/geomBuilder.py
   COMMAND ${PYTHON_EXECUTABLE} ${f} -o tmp/gsketcher.py       ${CMAKE_SOURCE_DIR}/src/GEOM_SWIG/gsketcher.py
-  COMMAND ${PYTHON_EXECUTABLE} ${f} -o tmp/CheckConformity.py ${CMAKE_SOURCE_DIR}/src/GEOM_SWIG/CheckConformity.py
+  COMMAND ${PYTHON_EXECUTABLE} ${f} -o tmp/conformity.py ${CMAKE_SOURCE_DIR}/src/GEOM_SWIG/conformity.py
   COMMAND ${PYTHON_EXECUTABLE} ${f} -o tmp/geomtools.py       ${CMAKE_SOURCE_DIR}/src/GEOM_PY/geomtools.py
   COMMAND ${PYTHON_EXECUTABLE} ${f} -o tmp/sketcher.py        ${CMAKE_SOURCE_DIR}/src/GEOM_PY/sketcher.py
   COMMAND ${PYTHON_EXECUTABLE} ${f} -o tmp/structelem.py      ${CMAKE_SOURCE_DIR}/src/GEOM_PY/structelem/__init__.py

diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc
index 1b990f606553613b1a2a21bf2eb5fdfb12dc90c3..3cd8947d7949b013b3a9e8582d0d2a95372a0617 100644 (file)
--- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc
+++ b/src/GEOM_I/GEOM_IMeasureOperations_i.cc
@@ -1277,7 +1277,7 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::ShapeProximityCalculator(GEOM::
  //=============================================================================
 void GEOM_IMeasureOperations_i::SetShapeSampling(GEOM::GEOM_Object_ptr theCalculator,
                                                  GEOM::GEOM_Object_ptr theShape,
-                                                 long theNbSamples)
+                                                 CORBA::Long theNbSamples)
 {
   //Set a not done flag
   GetOperations()->SetNotDone();
@@ -1489,7 +1489,7 @@ GEOM::GEOM_IMeasureOperations::CheckResults* GEOM_IMeasureOperations_i::CheckCon
 
   //Get the reference shape
   Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
-  if (aShapeRef.IsNull()) return false;
+  if (aShapeRef.IsNull()) return nullptr;
 
   std::list<GEOMImpl_IMeasureOperations::FailedChecks> aChecks;
   GetOperations()->CheckConformityShape(aShapeRef, aChecks);

diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.hh b/src/GEOM_I/GEOM_IMeasureOperations_i.hh
index e3307e7ac2c9bd4eefbbbcb67fea99d458f5273e..21ed3346dab4c4206ceca76f95f1ae28688c9b73 100644 (file)
--- a/src/GEOM_I/GEOM_IMeasureOperations_i.hh
+++ b/src/GEOM_I/GEOM_IMeasureOperations_i.hh
@@ -175,7 +175,7 @@ class GEOM_I_EXPORT GEOM_IMeasureOperations_i :
                                                   GEOM::GEOM_Object_ptr theShape2);
   void SetShapeSampling(GEOM::GEOM_Object_ptr theCalculator,
                         GEOM::GEOM_Object_ptr theShape,
-                        long theNbSamples);
+                        CORBA::Long theNbSamples);
   CORBA::Double GetCoarseProximity(GEOM::GEOM_Object_ptr theCalculator);
   CORBA::Double GetPreciseProximity(GEOM::GEOM_Object_ptr theCalculator);