[EDF30834] : reduce precompilation lines

diff --git a/src/ShapeRecogn/Areas.hxx b/src/ShapeRecogn/Areas.hxx
index b1b6f6bca438b5fc81e4aed5e985ba599be53da2..2ed857ba0c6b983f804032e70294cc5c86979861 100644 (file)
--- a/src/ShapeRecogn/Areas.hxx
+++ b/src/ShapeRecogn/Areas.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __AREAS_HXX__
-#define __AREAS_HXX__
+#pragma once
 
 #include "PrimitiveType.hxx"
 #include "Nodes.hxx"
@@ -103,6 +102,4 @@ namespace MEDCoupling
         const Nodes *nodes;
         std::vector<mcIdType> areaIdByNodes;
     };
-};
-
-#endif // __AREAS_HXX__
+}

diff --git a/src/ShapeRecogn/AreasBuilder.hxx b/src/ShapeRecogn/AreasBuilder.hxx
index 9742af648fe1f5aa476f694b2ed35a1f18c270fb..216ca76dcf9850872078c5af927dad2cc2440de5 100644 (file)
--- a/src/ShapeRecogn/AreasBuilder.hxx
+++ b/src/ShapeRecogn/AreasBuilder.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __AREASBUILDER_HXX__
-#define __AREASBUILDER_HXX__
+#pragma once
 
 #include "Nodes.hxx"
 #include "Areas.hxx"
@@ -69,6 +68,4 @@ namespace MEDCoupling
 
         size_t threshold = 5;
     };
-};
-
-#endif // __AREASBUILDER_HXX__
\ No newline at end of file
+}

diff --git a/src/ShapeRecogn/CMakeLists.txt b/src/ShapeRecogn/CMakeLists.txt
index 1f63ae163bc1e79642f274c13cdd9f689afa69ea..6b879d1d93959dc935b2fc326192f485ce2b42db 100644 (file)
--- a/src/ShapeRecogn/CMakeLists.txt
+++ b/src/ShapeRecogn/CMakeLists.txt
@@ -57,7 +57,6 @@ TARGET_LINK_LIBRARIES(shaperecogn medcouplingcpp medloader ${MEDFILE_C_LIBRARIES
 INSTALL(TARGETS shaperecogn EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${MEDCOUPLING_INSTALL_LIBS})
 
 FILE(GLOB shaperecogn_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-INSTALL(FILES ${shaperecogn_HEADERS_HXX} DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})
 
 # To allow usage as SWIG dependencies:
 SET(shaperecogn_HEADERS_HXX PARENT_SCOPE)

diff --git a/src/ShapeRecogn/MathOps.hxx b/src/ShapeRecogn/MathOps.hxx
index e511845da16639aa48ac30f69ef68cc3541b429a..275ab6759449e05fd9ff6051bfb304cef8c93eab 100644 (file)
--- a/src/ShapeRecogn/MathOps.hxx
+++ b/src/ShapeRecogn/MathOps.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __MATHOPS_HXX__
-#define __MATHOPS_HXX__
+#pragma once
 
 #include <vector>
 #include <array>
@@ -66,6 +65,4 @@ namespace MEDCoupling
         static double computeVariance(std::vector<double> values);
         static std::array<double, 6> computeBaseFromNormal(std::array<double, 3> normal);
     };
-};
-
-#endif //__MATHOPS_HXX__
+}

diff --git a/src/ShapeRecogn/Nodes.hxx b/src/ShapeRecogn/Nodes.hxx
index 729a1910ef5ac19ea8f9dbca6aeb4a32f61c7633..86d8638edf6d218255ba92af05937708a45a5114 100644 (file)
--- a/src/ShapeRecogn/Nodes.hxx
+++ b/src/ShapeRecogn/Nodes.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __NODES_HXX__
-#define __NODES_HXX__
+#pragma once
 
 #include <vector>
 #include "MEDCouplingUMesh.hxx"
@@ -73,6 +72,4 @@ namespace MEDCoupling
         std::vector<double> mainDirections;
         std::vector<PrimitiveType> primitives;
     };
-};
-
-#endif //__NODES_HXX__
+}

diff --git a/src/ShapeRecogn/NodesBuilder.hxx b/src/ShapeRecogn/NodesBuilder.hxx
index 19011806435a257859011bccecd0d320a6466fd3..50ec47d532298c16ab212cbf47caf482d51905d4 100644 (file)
--- a/src/ShapeRecogn/NodesBuilder.hxx
+++ b/src/ShapeRecogn/NodesBuilder.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __NODECURVATURECALCULATOR_HXX__
-#define __NODECURVATURECALCULATOR_HXX__
+#pragma once
 
 #include <string>
 #include <vector>
@@ -57,6 +56,4 @@ namespace MEDCoupling
         const MEDCouplingUMesh *mesh;
         Nodes *nodes;
     };
-};
-
-#endif //__NODECURVATURECALCULATOR_HXX__
\ No newline at end of file
+}

diff --git a/src/ShapeRecogn/PrimitiveType.hxx b/src/ShapeRecogn/PrimitiveType.hxx
index b131da84ab0f84c6619ea311052b49305d7c03c3..3a757915eebd01018dede80e8af6aa0bd50c0e8c 100644 (file)
--- a/src/ShapeRecogn/PrimitiveType.hxx
+++ b/src/ShapeRecogn/PrimitiveType.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __PRIMITIVETYPE_HXX__
-#define __PRIMITIVETYPE_HXX__
+#pragma once
 
 #include <string>
 namespace MEDCoupling
@@ -89,5 +88,3 @@ namespace MEDCoupling
         return typeInt;
     };
 };
-
-#endif // __PRIMITIVETYPE_HXX__
\ No newline at end of file

diff --git a/src/ShapeRecogn/ShapeRecognMesh.hxx b/src/ShapeRecogn/ShapeRecognMesh.hxx
index 1ab49bf3ac2dcf6bec5e5f4a786286230f667a7d..08edecc98065e5ffbb1e00d88149805f27f1de73 100644 (file)
--- a/src/ShapeRecogn/ShapeRecognMesh.hxx
+++ b/src/ShapeRecogn/ShapeRecognMesh.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __SHAPERECOGNMESH_HXX__
-#define __SHAPERECOGNMESH_HXX__
+#pragma once
 
 #include <string>
 
@@ -75,6 +74,4 @@ namespace MEDCoupling
         MCAuto<MEDCouplingFieldDouble> axis;
         MCAuto<MEDCouplingFieldDouble> apex;
     };
-};
-
-#endif // __SHAPERECOGNMESH_HXX__
+}

diff --git a/src/ShapeRecogn/ShapeRecognMeshBuilder.hxx b/src/ShapeRecogn/ShapeRecognMeshBuilder.hxx
index 9bc6ce3d8c78371cb7dc573b27cee52c5e351c0e..bdb6aff71ca13fe683fceb4543fd2b743ab7cf85 100644 (file)
--- a/src/ShapeRecogn/ShapeRecognMeshBuilder.hxx
+++ b/src/ShapeRecogn/ShapeRecognMeshBuilder.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __SHAPERECOGNMESHBUILDER_HXX__
-#define __SHAPERECOGNMESHBUILDER_HXX__
+#pragma once
 
 #include <string>
 
@@ -83,6 +82,4 @@ namespace MEDCoupling
         std::unique_ptr<Nodes> nodes;
         std::unique_ptr<Areas> areas;
     };
-};
-
-#endif // __SHAPERECOGNMESHBUILDER_HXX__
+}

diff --git a/src/ShapeRecogn/ShapeRecongConstants.hxx b/src/ShapeRecogn/ShapeRecongConstants.hxx
index 801df4dfa7bf5da188094678bc7da8b55f3dc2aa..a79da8f5df3d2ee9f96107fdcd602a2ec0939cc5 100644 (file)
--- a/src/ShapeRecogn/ShapeRecongConstants.hxx
+++ b/src/ShapeRecogn/ShapeRecongConstants.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __SHAPERECOGNCONSTANTS_HXX__
-#define __SHAPERECOGNCONSTANTS_HXX__
+#pragma once
 
 namespace MEDCoupling
 {
@@ -38,6 +37,4 @@ namespace MEDCoupling
     // - Thresholds
     constexpr int THRESHOLD_MIN_NB_NODES = 5;
     constexpr int THRESHOLD_MAX_NB_AREAS = 500;
-};
-
-#endif //__SHAPERECOGNCONSTANTS_HXX__
\ No newline at end of file
+}

diff --git a/src/ShapeRecogn/Test/ConeTest.hxx b/src/ShapeRecogn/Test/ConeTest.hxx
index b9e577e0fc5805d46bc6fba93e03a1b661ace95e..509301cdb72d92917ed3ae7b101be96d00c525d1 100644 (file)
--- a/src/ShapeRecogn/Test/ConeTest.hxx
+++ b/src/ShapeRecogn/Test/ConeTest.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __CONETEST_HXX__
-#define __CONETEST_HXX__
+#pragma once
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
@@ -61,6 +60,4 @@ namespace MEDCoupling
         std::unique_ptr<ShapeRecognMeshBuilder> srMesh;
         const Areas *areas;
     };
-};
-
-#endif // __CONETEST_HXX__
+}

diff --git a/src/ShapeRecogn/Test/CylinderTest.hxx b/src/ShapeRecogn/Test/CylinderTest.hxx
index 9abab65d2776359d222fd75f0db6b926820360af..dffdf6b55ee00281a427e97c53dcd3f51a5ef866 100644 (file)
--- a/src/ShapeRecogn/Test/CylinderTest.hxx
+++ b/src/ShapeRecogn/Test/CylinderTest.hxx
@@ -17,9 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __CYLINDERTEST_HXX__
-#define __CYLINDERTEST_HXX__
-
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
@@ -54,6 +51,4 @@ namespace MEDCoupling
         std::unique_ptr< ShapeRecognMeshBuilder > srMesh;
         const Areas *areas;
     };
-};
-
-#endif // __CYLINDERTEST_HXX__
+}

diff --git a/src/ShapeRecogn/Test/MathOpsTest.hxx b/src/ShapeRecogn/Test/MathOpsTest.hxx
index 2988a950be40784d4b976052596b664ce75f046e..2cbd48ef783d587a7622790d635369a4af1e61e7 100644 (file)
--- a/src/ShapeRecogn/Test/MathOpsTest.hxx
+++ b/src/ShapeRecogn/Test/MathOpsTest.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __MATHOPSTEST_HXX__
-#define __MATHOPSTEST_HXX__
+#pragma once
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
@@ -46,6 +45,4 @@ namespace MEDCoupling
         static void testComputeAngles();
         static void testComputeBaseFromNormal();
     };
-};
-
-#endif // __MATHOPSTEST_HXX__
+}

diff --git a/src/ShapeRecogn/Test/PlaneTest.hxx b/src/ShapeRecogn/Test/PlaneTest.hxx
index df75b543fd13bd46794ddfd22f19943d9f8dd241..61cc4251919c2034e2223f602fdf2bae5deb621a 100644 (file)
--- a/src/ShapeRecogn/Test/PlaneTest.hxx
+++ b/src/ShapeRecogn/Test/PlaneTest.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __PLANETEST_HXX__
-#define __PLANETEST_HXX__
+#pragma once
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
@@ -48,6 +47,4 @@ namespace MEDCoupling
         std::unique_ptr<ShapeRecognMeshBuilder> srMesh;
         const Areas *areas;
     };
-};
-
-#endif // __PLANETEST_HXX__
+}

diff --git a/src/ShapeRecogn/Test/SphereTest.hxx b/src/ShapeRecogn/Test/SphereTest.hxx
index c04218fd14d4fab406b888d1feff8497e2b69659..2b32cd792d812773559ede82e4ec535ed2754fdf 100644 (file)
--- a/src/ShapeRecogn/Test/SphereTest.hxx
+++ b/src/ShapeRecogn/Test/SphereTest.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __SPHERETEST_HXX__
-#define __SPHERETEST_HXX__
+#pragma once
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
@@ -48,6 +47,4 @@ namespace MEDCoupling
         std::unique_ptr<ShapeRecognMeshBuilder> srMesh;
         const Areas *areas;
     };
-};
-
-#endif // __SPHERETEST_HXX__
+}

diff --git a/src/ShapeRecogn/Test/TorusTest.hxx b/src/ShapeRecogn/Test/TorusTest.hxx
index 9c700c7a34426f0a7f9d633c375c87879cd84516..c84b0950b268ee180f9a8a7501192f60a40c0688 100644 (file)
--- a/src/ShapeRecogn/Test/TorusTest.hxx
+++ b/src/ShapeRecogn/Test/TorusTest.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __TORUSTEST_HXX__
-#define __TORUSTEST_HXX__
+#pragma once
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
@@ -48,6 +47,4 @@ namespace MEDCoupling
         std::unique_ptr< ShapeRecognMeshBuilder > srMesh;
         const Areas *areas;
     };
-};
-
-#endif // __TORUSTEST_HXX__
+}