bos #42837: quick review of Nabil work

diff --git a/src/ShapeRecogn/CMakeLists.txt b/src/ShapeRecogn/CMakeLists.txt
index 5d20a47c945269b12530b0940cf303b1b7d873a5..b312932e1aa9b267543316158df3f69b6c7b5369 100644 (file)
--- a/src/ShapeRecogn/CMakeLists.txt
+++ b/src/ShapeRecogn/CMakeLists.txt
@@ -53,17 +53,9 @@ SET(shaperecogn_SOURCES
 
 ADD_LIBRARY(shaperecogn ${shaperecogn_SOURCES})
 SET_TARGET_PROPERTIES(shaperecogn PROPERTIES COMPILE_FLAGS "")
-# if(WIN32)
-  # add_library(shaperecogn_lib STATIC  ${shaperecogn_SOURCES})
-  # TARGET_LINK_LIBRARIES(shaperecogn_lib medcouplingcpp ${LAPACK_LIBRARIES})
-  # set_target_properties(shaperecogn_lib PROPERTIES OUTPUT_NAME shaperecogn)
-  # INSTALL(TARGETS shaperecogn EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${MEDCOUPLING_INSTALL_LIBS})
-  # INSTALL(TARGETS shaperecogn_lib DESTINATION ${MEDCOUPLING_INSTALL_LIBS})
-  # TARGET_LINK_LIBRARIES(shaperecogn medcouplingcpp ${LAPACK_LIBRARIES})
-# else(WIN32)
-  TARGET_LINK_LIBRARIES(shaperecogn medcouplingcpp ${LAPACK_LIBRARIES})
-  INSTALL(TARGETS shaperecogn EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${MEDCOUPLING_INSTALL_LIBS})
-# endif(WIN32)
+TARGET_LINK_LIBRARIES(shaperecogn medcouplingcpp ${LAPACK_LIBRARIES})
+INSTALL(TARGETS shaperecogn EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${MEDCOUPLING_INSTALL_LIBS})
+
 FILE(GLOB shaperecogn_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
 
 # To allow usage as SWIG dependencies:

diff --git a/src/ShapeRecogn/Nodes.cxx b/src/ShapeRecogn/Nodes.cxx
index 61f295dd9be2e3487a374c880398ef6942a4f818..885c908682aa2929d85e8a101abd2d2c3590afe0 100644 (file)
--- a/src/ShapeRecogn/Nodes.cxx
+++ b/src/ShapeRecogn/Nodes.cxx
@@ -29,11 +29,6 @@ Nodes::Nodes(
 {
 }
 
-Nodes::~Nodes()
-{
-
-}
-
 mcIdType Nodes::getNbNodes() const
 {
     return coords->getNumberOfTuples();

diff --git a/src/ShapeRecogn/Nodes.hxx b/src/ShapeRecogn/Nodes.hxx
index 47347bfdcd8097e88794f0e905c7886e9a685d47..4122fd303d2d0f890cc35f931c26dee7c432382f 100644 (file)
--- a/src/ShapeRecogn/Nodes.hxx
+++ b/src/ShapeRecogn/Nodes.hxx
@@ -34,7 +34,6 @@ namespace MEDCoupling
         Nodes(const MEDCouplingUMesh *mesh,
               const DataArrayInt64 *neighbors,
               const DataArrayInt64 *neighborsIdx);
-        virtual ~Nodes();
 
         mcIdType getNbNodes() const;
         const std::vector<double> &getK1() const;

diff --git a/src/ShapeRecogn/ShapeRecognMesh.cxx b/src/ShapeRecogn/ShapeRecognMesh.cxx
index 3e29ea7ad6481fb079e2dc2ad8a010063f6b0bc0..61b664d097056ef24c00b93ea307e5817c8ad37d 100644 (file)
--- a/src/ShapeRecogn/ShapeRecognMesh.cxx
+++ b/src/ShapeRecogn/ShapeRecognMesh.cxx
@@ -29,11 +29,6 @@ ShapeRecognMesh::ShapeRecognMesh()
 {
 }
 
-ShapeRecognMesh::~ShapeRecognMesh()
-{
-
-}
-
 std::size_t ShapeRecognMesh::getHeapMemorySizeWithoutChildren() const
 {
     return 0;

diff --git a/src/ShapeRecogn/ShapeRecognMesh.hxx b/src/ShapeRecogn/ShapeRecognMesh.hxx
index 1cacedfd0b2fc46b9d43895600e620b656616359..c6df41fb5f63baf946c7f8210439d51467e365b5 100644 (file)
--- a/src/ShapeRecogn/ShapeRecognMesh.hxx
+++ b/src/ShapeRecogn/ShapeRecognMesh.hxx
@@ -61,7 +61,6 @@ namespace MEDCoupling
 
     protected:
         ShapeRecognMesh();
-        virtual ~ShapeRecognMesh();
 
     private:
         MCAuto<MEDCouplingFieldDouble> nodeK1;

diff --git a/src/ShapeRecogn/ShapeRecognMeshBuilder.cxx b/src/ShapeRecogn/ShapeRecognMeshBuilder.cxx
index 375443db8b797438a54f13636f236d376de2e2d1..bbfcd19cf03b0d8b0e7cd38fb478d660dfb73aa2 100644 (file)
--- a/src/ShapeRecogn/ShapeRecognMeshBuilder.cxx
+++ b/src/ShapeRecogn/ShapeRecognMeshBuilder.cxx
@@ -34,10 +34,6 @@
 
 using namespace MEDCoupling;
 
-ShapeRecognMeshBuilder::~ShapeRecognMeshBuilder()
-{
-    //comment
-}
 ShapeRecognMeshBuilder::ShapeRecognMeshBuilder(MCAuto< MEDCouplingUMesh > mesh)
 {
     assign( mesh );

diff --git a/src/ShapeRecogn/ShapeRecognMeshBuilder.hxx b/src/ShapeRecogn/ShapeRecognMeshBuilder.hxx
index 735e28eb535ce1499dd789938dba9010478bf804..4021319056ab037cbe582856bb4468c79edea1b4 100644 (file)
--- a/src/ShapeRecogn/ShapeRecognMeshBuilder.hxx
+++ b/src/ShapeRecogn/ShapeRecognMeshBuilder.hxx
@@ -42,7 +42,6 @@ namespace MEDCoupling
     public:
         ShapeRecognMeshBuilder(MCAuto< MEDCouplingUMesh > mesh);
         ShapeRecognMeshBuilder(MEDCouplingUMesh *mesh);
-        virtual ~ShapeRecognMeshBuilder();
 
         const Nodes *getNodes() const;
         const Areas *getAreas() const;

diff --git a/src/ShapeRecogn/Test/CMakeLists.txt b/src/ShapeRecogn/Test/CMakeLists.txt
index 953fa81378007cd5fc437a7568e7755bb7077184..be71456647bf92363faeffa585967edb68b1627b 100644 (file)
--- a/src/ShapeRecogn/Test/CMakeLists.txt
+++ b/src/ShapeRecogn/Test/CMakeLists.txt
@@ -47,7 +47,6 @@ SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
 IF(NOT MEDCOUPLING_MICROMED)
   SET(TESTSHAPE_RECOGN0 TestShapeRecogn)
   ADD_EXECUTABLE(${TESTSHAPE_RECOGN0} ${TestShapeRecogn_SOURCES})
-#  TARGET_LINK_LIBRARIES(${TESTSHAPE_RECOGN0} shaperecogn InterpKernelTestUtils medloader medcouplingcpp ${MEDFILE_C_LIBRARIES} ${HDF5_LIBRARIES} ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS} ${CBLAS_LIBRARIES})
   TARGET_LINK_LIBRARIES(${TESTSHAPE_RECOGN0} shaperecogn InterpKernelTestUtils medloader medcouplingcpp ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS} ${CBLAS_LIBRARIES})
 
   INSTALL(TARGETS ${TESTSHAPE_RECOGN0} DESTINATION ${MEDCOUPLING_INSTALL_BINS})