From: Anthony Geay Date: Thu, 29 Aug 2024 08:50:40 +0000 (+0200) Subject: [EDF30834] : reduce precompilation lines X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=aefa879233deba9fbddd9213032f827210c69891;p=tools%2Fmedcoupling.git [EDF30834] : reduce precompilation lines --- diff --git a/src/ShapeRecogn/Areas.hxx b/src/ShapeRecogn/Areas.hxx index b1b6f6bca..2ed857ba0 100644 --- 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 areaIdByNodes; }; -}; - -#endif // __AREAS_HXX__ +} diff --git a/src/ShapeRecogn/AreasBuilder.hxx b/src/ShapeRecogn/AreasBuilder.hxx index 9742af648..216ca76dc 100644 --- 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 1f63ae163..6b879d1d9 100644 --- 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 e511845da..275ab6759 100644 --- 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 #include @@ -66,6 +65,4 @@ namespace MEDCoupling static double computeVariance(std::vector values); static std::array computeBaseFromNormal(std::array normal); }; -}; - -#endif //__MATHOPS_HXX__ +} diff --git a/src/ShapeRecogn/Nodes.hxx b/src/ShapeRecogn/Nodes.hxx index 729a1910e..86d8638ed 100644 --- 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 #include "MEDCouplingUMesh.hxx" @@ -73,6 +72,4 @@ namespace MEDCoupling std::vector mainDirections; std::vector primitives; }; -}; - -#endif //__NODES_HXX__ +} diff --git a/src/ShapeRecogn/NodesBuilder.hxx b/src/ShapeRecogn/NodesBuilder.hxx index 190118064..50ec47d53 100644 --- 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 #include @@ -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 b131da84a..3a757915e 100644 --- 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 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 1ab49bf3a..08edecc98 100644 --- 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 @@ -75,6 +74,4 @@ namespace MEDCoupling MCAuto axis; MCAuto apex; }; -}; - -#endif // __SHAPERECOGNMESH_HXX__ +} diff --git a/src/ShapeRecogn/ShapeRecognMeshBuilder.hxx b/src/ShapeRecogn/ShapeRecognMeshBuilder.hxx index 9bc6ce3d8..bdb6aff71 100644 --- 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 @@ -83,6 +82,4 @@ namespace MEDCoupling std::unique_ptr nodes; std::unique_ptr areas; }; -}; - -#endif // __SHAPERECOGNMESHBUILDER_HXX__ +} diff --git a/src/ShapeRecogn/ShapeRecongConstants.hxx b/src/ShapeRecogn/ShapeRecongConstants.hxx index 801df4dfa..a79da8f5d 100644 --- 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 b9e577e0f..509301cdb 100644 --- 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 #include @@ -61,6 +60,4 @@ namespace MEDCoupling std::unique_ptr srMesh; const Areas *areas; }; -}; - -#endif // __CONETEST_HXX__ +} diff --git a/src/ShapeRecogn/Test/CylinderTest.hxx b/src/ShapeRecogn/Test/CylinderTest.hxx index 9abab65d2..dffdf6b55 100644 --- 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 #include @@ -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 2988a950b..2cbd48ef7 100644 --- 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 #include @@ -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 df75b543f..61cc42519 100644 --- 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 #include @@ -48,6 +47,4 @@ namespace MEDCoupling std::unique_ptr srMesh; const Areas *areas; }; -}; - -#endif // __PLANETEST_HXX__ +} diff --git a/src/ShapeRecogn/Test/SphereTest.hxx b/src/ShapeRecogn/Test/SphereTest.hxx index c04218fd1..2b32cd792 100644 --- 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 #include @@ -48,6 +47,4 @@ namespace MEDCoupling std::unique_ptr srMesh; const Areas *areas; }; -}; - -#endif // __SPHERETEST_HXX__ +} diff --git a/src/ShapeRecogn/Test/TorusTest.hxx b/src/ShapeRecogn/Test/TorusTest.hxx index 9c700c7a3..c84b0950b 100644 --- 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 #include @@ -48,6 +47,4 @@ namespace MEDCoupling std::unique_ptr< ShapeRecognMeshBuilder > srMesh; const Areas *areas; }; -}; - -#endif // __TORUSTEST_HXX__ +}