format: fixing includes of hxx/txx

diff --git a/src/INTERP_KERNEL/Barycentric3DIntersectorP1P1.txx b/src/INTERP_KERNEL/Barycentric3DIntersectorP1P1.txx
index 7716959dc003f9f3c30247a6cbbd539143d758a1..ec55febb8da9e9c99a080c4c8ba9c682240a3b2c 100644 (file)
--- a/src/INTERP_KERNEL/Barycentric3DIntersectorP1P1.txx
+++ b/src/INTERP_KERNEL/Barycentric3DIntersectorP1P1.txx
@@ -22,7 +22,7 @@
 #define __BARYCENTRIC3DINTERSECTORP1P1_TXX__
 
 #include "Barycentric3DIntersectorP1P1.hxx"
-#include "Intersector3DP1P1.hxx"
+#include "Intersector3DP1P1.txx"
 #include "InterpolationUtils.hxx"
 #include <vector>
 #include <cstddef>

diff --git a/src/INTERP_KERNEL/ConvexIntersector.txx b/src/INTERP_KERNEL/ConvexIntersector.txx
index a874e1b7b32fe0d70d1a27960a3a3dc36fa2462e..fdc98317a8d1b96b5a0705405aae7781eb1681ab 100644 (file)
--- a/src/INTERP_KERNEL/ConvexIntersector.txx
+++ b/src/INTERP_KERNEL/ConvexIntersector.txx
@@ -21,9 +21,15 @@
 #define __CONVEXINTERSECTOR_TXX__
 
 #include "ConvexIntersector.hxx"
-#include "PlanarIntersector.hxx"
+#include "PlanarIntersector.txx"
+#include "PlanarIntersectorP0P0.txx"
+#include "PlanarIntersectorP0P1.txx"
+#include "PlanarIntersectorP1P0.txx"
+#include "PlanarIntersectorP1P1.txx"
+#include "PlanarIntersectorP1P0Bary.txx"
+#include "PlanarIntersectorP0P1Bary.txx"
 
-#include "PolygonAlgorithms.hxx"
+#include "PolygonAlgorithms.txx"
 #include "InterpolationUtils.hxx"
 
 #include <deque>

diff --git a/src/INTERP_KERNEL/CurveIntersector.hxx b/src/INTERP_KERNEL/CurveIntersector.hxx
index e4eec5ba6eb8dac89deb6a28202716682b012d76..ff81860d6b9839739ee150d737ada6a238545cd9 100644 (file)
--- a/src/INTERP_KERNEL/CurveIntersector.hxx
+++ b/src/INTERP_KERNEL/CurveIntersector.hxx
@@ -21,7 +21,7 @@
 #ifndef __CURVEINTERSECTOR_HXX__
 #define __CURVEINTERSECTOR_HXX__
 
-#include "TargetIntersector.hxx"
+#include "TargetIntersector.txx"
 #include "NormalizedUnstructuredMesh.hxx"
 #include <vector>
 
@@ -33,7 +33,7 @@ namespace INTERP_KERNEL
   public:
     static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
     static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    using ConnType = typename MyMeshType::MyConnType;
+    typedef typename MyMeshType::MyConnType ConnType;
     static const NumberingPolicy numPol=MyMeshType::My_numPol;
   public:
     CurveIntersector(const MyMeshType& meshT, const MyMeshType& meshS,

diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx
index 7c0c2f27db784271618ba5306b7578746baa1c7c..25c2d6e9f0f26353559f45a1c418cb4e02041db1 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx
@@ -32,7 +32,7 @@
 
 namespace INTERP_KERNEL
 {
-  using TypeOfLocInPolygon = enum
+  typedef enum
   {
     IN_1      =  7,
     ON_1      =  8,
@@ -40,7 +40,7 @@ namespace INTERP_KERNEL
     ON_TANG_1 =  9,
     OUT_1     = 10,
     UNKNOWN   = 11
-  };
+  } TypeOfLocInPolygon;
 
   class Bounds;
 

diff --git a/src/INTERP_KERNEL/Geometric2DIntersector.txx b/src/INTERP_KERNEL/Geometric2DIntersector.txx
index e1128ec9cea34962cb7fe91f506b8fb0a1e44c33..53caa6734bfeb943e408f427bdb7f465fdc37b1f 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2DIntersector.txx
+++ b/src/INTERP_KERNEL/Geometric2DIntersector.txx
@@ -21,14 +21,14 @@
 #define __GEOMETRIC2DINTERSECTOR_TXX__
 
 #include "Geometric2DIntersector.hxx"
-#include "PlanarIntersector.hxx"
-// #include "PlanarIntersectorP0P0.txx"
-// #include "Planar2D1DIntersectorP0P0.txx"
-// #include "PlanarIntersectorP0P1.txx"
-// #include "PlanarIntersectorP1P0.txx"
-// #include "PlanarIntersectorP1P1.txx"
-// #include "PlanarIntersectorP1P0Bary.txx"
-// #include "PlanarIntersectorP0P1Bary.txx"
+#include "PlanarIntersector.txx"
+#include "PlanarIntersectorP0P0.txx"
+#include "Planar2D1DIntersectorP0P0.txx"
+#include "PlanarIntersectorP0P1.txx"
+#include "PlanarIntersectorP1P0.txx"
+#include "PlanarIntersectorP1P1.txx"
+#include "PlanarIntersectorP1P0Bary.txx"
+#include "PlanarIntersectorP0P1Bary.txx"
 #include "InterpolationUtils.hxx"
 #include "CellModel.hxx"
 #include "NormalizedGeometricTypes"

diff --git a/src/INTERP_KERNEL/Interpolation.txx b/src/INTERP_KERNEL/Interpolation.txx
index faa0a97f9ac8f41b9da3b400199e91c5e5f93cf3..8533cbe63c8671531260f5c978f5b50901a17728 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation.txx
+++ b/src/INTERP_KERNEL/Interpolation.txx
@@ -21,7 +21,7 @@
 #define __INTERPOLATION_TXX__
 
 #include "Interpolation.hxx"
-#include "IntegralUniformIntersector.hxx"
+#include "IntegralUniformIntersector.txx"
 #include "InterpolationOptions.hxx"
 #include "InterpKernelException.hxx"
 #include "VectorUtils.hxx"

diff --git a/src/INTERP_KERNEL/Interpolation1D.hxx b/src/INTERP_KERNEL/Interpolation1D.hxx
index 669fd516768d23ac303e8b6983c4dc424cea451a..3a8a3d755aafb6e7d4ebc9a3fceefd942c33f42d 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation1D.hxx
+++ b/src/INTERP_KERNEL/Interpolation1D.hxx
@@ -22,7 +22,7 @@
 #define __INTERPOLATION1D_HXX__
 
 #include "InterpolationOptions.hxx"
-#include "InterpolationCurve.hxx"
+#include "InterpolationCurve.txx"
 
 namespace INTERP_KERNEL
 {

diff --git a/src/INTERP_KERNEL/Interpolation1D0D.txx b/src/INTERP_KERNEL/Interpolation1D0D.txx
index cab74b5a7b42a0f31a338dc008779ccdb023ab95..8bae8193ba48e72c3fa80b4928f4aa64fbae3beb 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation1D0D.txx
+++ b/src/INTERP_KERNEL/Interpolation1D0D.txx
@@ -44,7 +44,7 @@ namespace INTERP_KERNEL
   typename MyMeshType::MyConnType Interpolation1D0D::interpolateMeshes(const MyMeshType& srcMesh, const MyMeshType& targetMesh, MatrixType& result, const std::string& method)
   {
     constexpr int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    using ConnType=typename MyMeshType::MyConnType;
+    typedef typename MyMeshType::MyConnType ConnType;
     IKAssert(SPACEDIM==3);
 
     if(InterpolationOptions::getIntersectionType() != PointLocator)

diff --git a/src/INTERP_KERNEL/Interpolation2D.hxx b/src/INTERP_KERNEL/Interpolation2D.hxx
index b27343f7068e14889572ca168ea7c62268a9b6c9..63215244598db9bfa97349b89fb4673db5c1671d 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation2D.hxx
+++ b/src/INTERP_KERNEL/Interpolation2D.hxx
@@ -23,7 +23,7 @@
 
 #include "InterpolationOptions.hxx"
 #include "PlanarIntersector.hxx"
-#include "InterpolationPlanar.hxx"
+#include "InterpolationPlanar.txx"
 #include <vector>
 
 namespace INTERP_KERNEL

diff --git a/src/INTERP_KERNEL/Interpolation2D1D.txx b/src/INTERP_KERNEL/Interpolation2D1D.txx
index da4322ff2e28ddbfe30c7c802e0751ec3d5abbf3..d2fd7cfb55d157d9a32519d4006368efe6353047 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation2D1D.txx
+++ b/src/INTERP_KERNEL/Interpolation2D1D.txx
@@ -23,10 +23,10 @@
 #include "Interpolation2D1D.hxx"
 #include <string>
 #include "NormalizedUnstructuredMesh.hxx"
-#include "PlanarIntersector.hxx"
+#include "PlanarIntersector.txx"
 #include "Planar2D1DIntersectorP0P0.hxx"
 #include "InterpolationOptions.hxx"
-#include "Geometric2DIntersector.hxx"
+#include "Geometric2DIntersector.txx"
 #include "InterpKernelException.hxx"
 #include "BBTree.txx"
 #include "InterpolationUtils.hxx"

diff --git a/src/INTERP_KERNEL/Interpolation2D3D.txx b/src/INTERP_KERNEL/Interpolation2D3D.txx
index b5e2b1a1caf03d7f253163e534497535ca6f499f..5dd719852950e51368c78c43a7e93f5fc6250d6c 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation2D3D.txx
+++ b/src/INTERP_KERNEL/Interpolation2D3D.txx
@@ -22,12 +22,13 @@
 #include "BBTreeStandAlone.txx"
 #include "BoundingBox.hxx"
 #include "Interpolation2D3D.hxx"
-#include "Intersector3D.hxx"
+// #include "Interpolation.txx"
+#include "Intersector3D.txx"
 #include "Log.hxx"
 #include "InterpolationOptions.hxx"
-#include "MeshElement.hxx"
+#include "MeshElement.txx"
 #include "NormalizedGeometricTypes"
-#include "Polyhedron3D2DIntersectorP0P0.hxx"
+#include "Polyhedron3D2DIntersectorP0P0.txx"
 #include "InterpolationHelper.txx"
 #include "InterpKernelException.hxx"
 

diff --git a/src/INTERP_KERNEL/Interpolation2DCurve.cxx b/src/INTERP_KERNEL/Interpolation2DCurve.cxx
index a845f9f06558ed03790ffd5f1b0b558cf480d078..baabef9c2a2e40385819c3ae2aa054311883bf31 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation2DCurve.cxx
+++ b/src/INTERP_KERNEL/Interpolation2DCurve.cxx
@@ -19,7 +19,7 @@
 // Author : Anthony Geay (CEA/DEN)
 
 #include "Interpolation2DCurve.hxx"
-#include "InterpolationCurve.hxx"
+#include "InterpolationCurve.txx"
 #include "InterpolationOptions.hxx"
 
 namespace INTERP_KERNEL

diff --git a/src/INTERP_KERNEL/Interpolation3D.txx b/src/INTERP_KERNEL/Interpolation3D.txx
index 7e04c4a861635f7a79713477bbce8d43bdb36a13..ecee51b99d3f8057fb796ddb41fb205ab42f425f 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation3D.txx
+++ b/src/INTERP_KERNEL/Interpolation3D.txx
@@ -21,23 +21,25 @@
 #ifndef __INTERPOLATION3D_TXX__
 #define __INTERPOLATION3D_TXX__
 
-#include "Barycentric3DIntersectorP1P1.hxx"
+#include "Interpolation3D.hxx"
+
 #include "BBTreeStandAlone.txx"
 #include "BoundingBox.hxx"
-#include "Interpolation3D.hxx"
 #include "InterpolationOptions.hxx"
 #include "Intersector3D.hxx"
-#include "MappedBarycentric3DIntersectorP1P1.hxx"
-#include "MeshElement.hxx"
-#include "PolyhedronIntersectorP0P0.hxx"
-#include "PointLocator3DIntersectorP0P0.hxx"
-#include "PolyhedronIntersectorP0P1.hxx"
-#include "PointLocator3DIntersectorP0P1.hxx"
-#include "PolyhedronIntersectorP1P0.hxx"
-#include "PointLocator3DIntersectorP1P0.hxx"
-#include "PolyhedronIntersectorP1P0Bary.hxx"
-#include "PolyhedronIntersectorP1P1.hxx"
-#include "PointLocator3DIntersectorP1P1.hxx"
+#include "MeshElement.txx"
+
+#include "PolyhedronIntersectorP0P0.txx"
+#include "PointLocator3DIntersectorP0P0.txx"
+#include "PolyhedronIntersectorP0P1.txx"
+#include "PointLocator3DIntersectorP0P1.txx"
+#include "PolyhedronIntersectorP1P0.txx"
+#include "PolyhedronIntersectorP1P0Bary.txx"
+#include "PointLocator3DIntersectorP1P0.txx"
+#include "PolyhedronIntersectorP1P1.txx"
+#include "PointLocator3DIntersectorP1P1.txx"
+#include "Barycentric3DIntersectorP1P1.txx"
+#include "MappedBarycentric3DIntersectorP1P1.txx"
 #include "Log.hxx"
 #include "InterpKernelException.hxx"
 #include <memory>

diff --git a/src/INTERP_KERNEL/Interpolation3DSurf.cxx b/src/INTERP_KERNEL/Interpolation3DSurf.cxx
index f9f5083606cbeafbc5bf7c6c4656a4277b2ef2b0..308a88a791b8f5d5eb74699680880a4005ced1d4 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation3DSurf.cxx
+++ b/src/INTERP_KERNEL/Interpolation3DSurf.cxx
@@ -20,7 +20,7 @@
 
 #include "Interpolation3DSurf.hxx"
 #include "InterpolationOptions.hxx"
-#include "InterpolationPlanar.hxx"
+#include "InterpolationPlanar.txx"
 
 namespace INTERP_KERNEL
 {

diff --git a/src/INTERP_KERNEL/Interpolation3DSurf.hxx b/src/INTERP_KERNEL/Interpolation3DSurf.hxx
index f6ef50869251075210dee5ac0f407b4c6f4094d8..8d48360018d3ea8d4c50533a499be9d9b82af080 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation3DSurf.hxx
+++ b/src/INTERP_KERNEL/Interpolation3DSurf.hxx
@@ -24,7 +24,7 @@
 #include "INTERPKERNELDefines.hxx"
 #include "InterpolationOptions.hxx"
 #include "PlanarIntersector.hxx"
-#include "InterpolationPlanar.hxx"
+#include "InterpolationPlanar.txx"
 #include <vector>
 
 namespace INTERP_KERNEL

diff --git a/src/INTERP_KERNEL/InterpolationCU.txx b/src/INTERP_KERNEL/InterpolationCU.txx
index 69152f11844f69ecf10d02ba1f29ceaab0a7605d..b765ee44780246aab7c98ed34f62c3c6105e3c1e 100644 (file)
--- a/src/INTERP_KERNEL/InterpolationCU.txx
+++ b/src/INTERP_KERNEL/InterpolationCU.txx
@@ -27,10 +27,10 @@
 
 #include "InterpolationUtils.hxx"
 #include "InterpolationOptions.hxx"
-#include "IntersectorCU.hxx"
-#include "IntersectorCU1D.hxx"
-#include "IntersectorCU2D.hxx"
-#include "IntersectorCU3D.hxx"
+#include "IntersectorCU.txx"
+#include "IntersectorCU1D.txx"
+#include "IntersectorCU2D.txx"
+#include "IntersectorCU3D.txx"
 #include "NormalizedGeometricTypes"
 #include "TargetIntersector.hxx"
 #include <string>

diff --git a/src/INTERP_KERNEL/InterpolationCurve.txx b/src/INTERP_KERNEL/InterpolationCurve.txx
index 63b6103e85e4331bb6b09ac8d5ad9ec15823c124..bb0e5bf02a9837fba14a2396f50c12f50f40ccf9 100644 (file)
--- a/src/INTERP_KERNEL/InterpolationCurve.txx
+++ b/src/INTERP_KERNEL/InterpolationCurve.txx
@@ -20,14 +20,14 @@
 #ifndef __INTERPOLATIONCURVE_TXX__
 #define __INTERPOLATIONCURVE_TXX__
 
-#include "Interpolation.hxx"
+#include "Interpolation.txx"
 #include "BBTree.txx"
-#include "CurveIntersector.hxx"
-#include "CurveIntersectorP0P0.hxx"
-#include "CurveIntersectorP0P1.hxx"
-#include "CurveIntersectorP1P0.hxx"
-#include "CurveIntersectorP1P1.hxx"
-#include "CurveIntersectorP1P1PL.hxx"
+#include "CurveIntersector.txx"
+#include "CurveIntersectorP0P0.txx"
+#include "CurveIntersectorP0P1.txx"
+#include "CurveIntersectorP1P0.txx"
+#include "CurveIntersectorP1P1.txx"
+#include "CurveIntersectorP1P1PL.txx"
 #include "InterpolationCurve.hxx"
 #include "InterpolationOptions.hxx"
 #include "NormalizedUnstructuredMesh.hxx"

diff --git a/src/INTERP_KERNEL/InterpolationHelper.txx b/src/INTERP_KERNEL/InterpolationHelper.txx
index ce0200a56c22184cf6e5e8e43f6a826287ac236d..f0fead1c88a5e6a23097d663d46904bfa93104db 100644 (file)
--- a/src/INTERP_KERNEL/InterpolationHelper.txx
+++ b/src/INTERP_KERNEL/InterpolationHelper.txx
@@ -21,7 +21,7 @@
 #pragma once
 
 #include "BBTreeStandAlone.txx"
-#include "MeshElement.hxx"
+#include "MeshElement.txx"
 #include "BoundingBox.hxx"
 #include "Log.hxx"
 

diff --git a/src/INTERP_KERNEL/InterpolationPlanar.txx b/src/INTERP_KERNEL/InterpolationPlanar.txx
index 824380a3387c736557980cd8a933647f2b86bfe2..29fe3fbc8b18fd209cec7305a2c4afebaf60f017 100644 (file)
--- a/src/INTERP_KERNEL/InterpolationPlanar.txx
+++ b/src/INTERP_KERNEL/InterpolationPlanar.txx
@@ -21,26 +21,29 @@
 #ifndef __INTERPOLATIONPLANAR_TXX__
 #define __INTERPOLATIONPLANAR_TXX__
 
-#include "Interpolation.hxx"
 #include "InterpolationPlanar.hxx"
+
+#include "Interpolation.txx"
 #include "InterpolationOptions.hxx"
 #include "NormalizedUnstructuredMesh.hxx"
 #include "InterpolationUtils.hxx"
-#include "PlanarIntersector.hxx"
+
 #include "PlanarIntersectorP0P0.hxx"
 #include "PlanarIntersectorP1P0.hxx"
 #include "PlanarIntersectorP0P1.hxx"
-#include "PlanarIntersectorP0P1PL.hxx"
-#include "PlanarIntersectorP1P0PL.hxx"
 #include "PlanarIntersectorP1P1.hxx"
-#include "PlanarIntersectorP1P1PL.hxx"
 #include "PlanarIntersectorP0P1Bary.hxx"
 #include "PlanarIntersectorP1P0Bary.hxx"
-#include "MappedBarycentric2DIntersectorP1P1.hxx"
-#include "ConvexIntersector.hxx"
-#include "PointLocator2DIntersector.hxx"
-#include "Geometric2DIntersector.hxx"
-#include "TriangulationIntersector.hxx"
+
+#include "PlanarIntersector.txx"
+#include "TriangulationIntersector.txx"
+#include "ConvexIntersector.txx"
+#include "Geometric2DIntersector.txx"
+#include "PointLocator2DIntersector.txx"
+#include "PlanarIntersectorP0P1PL.txx"
+#include "PlanarIntersectorP1P0PL.txx"
+#include "PlanarIntersectorP1P1PL.txx"
+#include "MappedBarycentric2DIntersectorP1P1.txx"
 #include "VectorUtils.hxx"
 #include "BBTree.txx"
 

diff --git a/src/INTERP_KERNEL/LinearAlgebra/InterpKernelDenseMatrix.cxx b/src/INTERP_KERNEL/LinearAlgebra/InterpKernelDenseMatrix.cxx
index bbb3d07329ebac34c04d564f3bc6c3d7d5f702e6..e0c8f7414fe57ceff9013b9c9177bc809ffdca54 100644 (file)
--- a/src/INTERP_KERNEL/LinearAlgebra/InterpKernelDenseMatrix.cxx
+++ b/src/INTERP_KERNEL/LinearAlgebra/InterpKernelDenseMatrix.cxx
@@ -18,6 +18,6 @@
 //
 
 #include "INTERPKERNELDefines.hxx"
-#include "InterpKernelDenseMatrix.hxx"
+#include "InterpKernelDenseMatrix.txx"
 
 template class INTERPKERNEL_EXPORT INTERP_KERNEL::DenseMatrixT<double>;

diff --git a/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.hxx b/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.hxx
index 41f18e55b90e7fb801a198455ad1ff098df4180a..9fb9a02ffea202403c3c13845bb584f2dcc40c7d 100644 (file)
--- a/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.hxx
+++ b/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.hxx
@@ -33,7 +33,7 @@ namespace INTERP_KERNEL
   public:
     static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
     static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    using ConnType = typename MyMeshType::MyConnType;
+    typedef typename MyMeshType::MyConnType ConnType;
     static const NumberingPolicy numPol=MyMeshType::My_numPol;
   public:
     MappedBarycentric3DIntersectorP1P1(const MyMeshType& targetMesh, const MyMeshType& srcMesh, double precision);

diff --git a/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.txx b/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.txx
index 9ed1673528e14a5866365f8fb0643da90bcdbc08..99a6bef6824802754c8cdf0e4db6eb7bf77dbbb6 100644 (file)
--- a/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.txx
+++ b/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.txx
@@ -21,7 +21,7 @@
 #ifndef __MAPPEDBARYCENTRIC3DINTERSECTORP1P1_TXX__
 #define __MAPPEDBARYCENTRIC3DINTERSECTORP1P1_TXX__
 
-#include "Intersector3DP1P1.hxx"
+#include "Intersector3DP1P1.txx"
 #include "InterpolationUtils.hxx"
 #include "InterpKernelUtilities.hxx"
 #include "MappedBarycentric3DIntersectorP1P1.hxx"

diff --git a/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.hxx b/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.hxx
index d760567e00dab68530d88eda81d08382d0790f9e..5a59eea4e733a7ec1f547b87adb03dd36ff11dc3 100644 (file)
--- a/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.hxx
+++ b/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.hxx
@@ -33,7 +33,7 @@ namespace INTERP_KERNEL
   public:
     static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
     static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    using ConnType = typename MyMeshType::MyConnType;
+    typedef typename MyMeshType::MyConnType ConnType;
     static const NumberingPolicy numPol=MyMeshType::My_numPol;
   protected:
     Planar2D1DIntersectorP0P0(const MyMeshType& meshT, const MyMeshType& meshS,

diff --git a/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.txx b/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.txx
index c4d10c034e058cf2578f5321b82543571f0f4fc1..df496b097bce62b26c7f13a9432e7d7423ac1e58 100644 (file)
--- a/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.txx
+++ b/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.txx
@@ -57,7 +57,7 @@ namespace INTERP_KERNEL
       {
         ConnType iS=*iter;
         ConnType nbNodesS=PlanarIntersector<MyMeshType,MyMatrix>::_connIndexS[iS+1]-PlanarIntersector<MyMeshType,MyMatrix>::_connIndexS[iS];
-        bool const isColinear = false;
+        bool isColinear = false;
         double surf=intersectGeometry1D(OTT<ConnType,numPol>::indFC(icellT),OTT<ConnType,numPol>::indFC(iS),
                                         nbNodesT,nbNodesS, isColinear);
         surf=PlanarIntersector<MyMeshType,MyMatrix>::getValueRegardingOption(surf);

diff --git a/src/INTERP_KERNEL/PlanarIntersector.hxx b/src/INTERP_KERNEL/PlanarIntersector.hxx
index c72ed4f6dfecd5d6b8b09cec1f215844e40c5e66..6cc8670c3317c99a49347374d0ce759f838cc276 100644 (file)
--- a/src/INTERP_KERNEL/PlanarIntersector.hxx
+++ b/src/INTERP_KERNEL/PlanarIntersector.hxx
@@ -21,7 +21,7 @@
 #ifndef __PLANARINTERSECTOR_HXX__
 #define __PLANARINTERSECTOR_HXX__
 
-#include "TargetIntersector.hxx"
+#include "TargetIntersector.txx"
 #include "NormalizedUnstructuredMesh.hxx"
 
 #include <cstddef>
@@ -39,9 +39,9 @@ namespace INTERP_KERNEL
   public:
     static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
     static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    using ConnType = typename MyMeshType::MyConnType;
+    typedef typename MyMeshType::MyConnType ConnType;
     static const NumberingPolicy numPol=MyMeshType::My_numPol;
-    using DuplicateFacesType = typename std::map<ConnType, std::set<ConnType>>;
+    typedef typename std::map<ConnType,std::set<ConnType> > DuplicateFacesType;
   public:
     PlanarIntersector(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double precision, double md3DSurf, double minDot3DSurf, double medianPlane, bool doRotate, int orientation, int printLevel);
     virtual ~PlanarIntersector();

diff --git a/src/INTERP_KERNEL/PlanarIntersectorP0P1.txx b/src/INTERP_KERNEL/PlanarIntersectorP0P1.txx
index 4eaf8eb252def90935f3d71f7f05f13eba4ff53e..66b6ca22820a22ebc35b0d5445ee16896cf51338 100644 (file)
--- a/src/INTERP_KERNEL/PlanarIntersectorP0P1.txx
+++ b/src/INTERP_KERNEL/PlanarIntersectorP0P1.txx
@@ -20,7 +20,7 @@
 #ifndef __PLANARINTERSECTORP0P1_TXX__
 #define __PLANARINTERSECTORP0P1_TXX__
 
-#include "PlanarIntersector.hxx"
+#include "PlanarIntersector.txx"
 #include "InterpKernelUtilities.hxx"
 #include "NormalizedGeometricTypes"
 #include "PlanarIntersectorP0P1.hxx"

diff --git a/src/INTERP_KERNEL/PlanarIntersectorP0P1Bary.hxx b/src/INTERP_KERNEL/PlanarIntersectorP0P1Bary.hxx
index acbd6d4f69d121cfb7818ec06e4e2f1b02d9e9ee..e79924ef0f72ecfa2872a8f615dc1289fb0dc4bf 100644 (file)
--- a/src/INTERP_KERNEL/PlanarIntersectorP0P1Bary.hxx
+++ b/src/INTERP_KERNEL/PlanarIntersectorP0P1Bary.hxx
@@ -33,7 +33,7 @@ namespace INTERP_KERNEL
   public:
     static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
     static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    using ConnType = typename MyMeshType::MyConnType;
+    typedef typename MyMeshType::MyConnType ConnType;
     static const NumberingPolicy numPol=MyMeshType::My_numPol;
   protected:
     PlanarIntersectorP0P1Bary(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double precision, double md3DSurf, double minDot3DSurf, double medianPlane, bool doRotate, int orientation, int printLevel);

diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P0.hxx b/src/INTERP_KERNEL/PlanarIntersectorP1P0.hxx
index 00e306deab4259e05a100ec034c050137710fb1a..4b64bee3c449f55ea38e53b987d8be80f9703d15 100644 (file)
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P0.hxx
+++ b/src/INTERP_KERNEL/PlanarIntersectorP1P0.hxx
@@ -33,7 +33,7 @@ namespace INTERP_KERNEL
   public:
     static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
     static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    using ConnType = typename MyMeshType::MyConnType;
+    typedef typename MyMeshType::MyConnType ConnType;
     static const NumberingPolicy numPol=MyMeshType::My_numPol;
   protected:
     PlanarIntersectorP1P0(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double precision, double md3DSurf, double minDot3DSurf, double medianPlane, bool doRotate, int orientation, int printLevel);

diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P0.txx b/src/INTERP_KERNEL/PlanarIntersectorP1P0.txx
index f203e0e0c43b8e17928b695894e2da0e6532f4be..3bf8cb26d82689a51c08936c30710b3f3eef8dc1 100644 (file)
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P0.txx
+++ b/src/INTERP_KERNEL/PlanarIntersectorP1P0.txx
@@ -21,7 +21,7 @@
 #define __PLANARINTERSECTORP1P0_TXX__
 
 #include "NormalizedGeometricTypes"
-#include "PlanarIntersector.hxx"
+#include "PlanarIntersector.txx"
 #include "PlanarIntersectorP1P0.hxx"
 #include "InterpolationUtils.hxx"
 #include "CellModel.hxx"

diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx b/src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx
index fd2391edfbfa10d3b82fd87422d2dd85818adf75..054949e554379582c0d900944636c496651dbe42 100644 (file)
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx
+++ b/src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx
@@ -20,10 +20,11 @@
 #ifndef __PLANARINTERSECTORP1P0PL_TXX__
 #define __PLANARINTERSECTORP1P0PL_TXX__
 
-#include "PlanarIntersector.hxx"
+#include "PlanarIntersector.txx"
 #include "InterpolationUtils.hxx"
 #include "NormalizedGeometricTypes"
 #include "PlanarIntersectorP1P0PL.hxx"
+#include "VolSurfFormulae.hxx"
 
 #include "PointLocatorAlgos.txx"
 #include <vector>

diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx b/src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx
index 294de6d42997935c3d6efd0b31d68b630c586611..d7b4834fc5722a5ed08a0afb5b18e4ca43e05b05 100644 (file)
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx
+++ b/src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx
@@ -33,7 +33,7 @@ namespace INTERP_KERNEL
   public:
     static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
     static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    using ConnType = typename MyMeshType::MyConnType;
+    typedef typename MyMeshType::MyConnType ConnType;
     static const NumberingPolicy numPol=MyMeshType::My_numPol;
   protected:
     PlanarIntersectorP1P1(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double precision, double md3DSurf, double minDot3DSurf, double medianPlane, bool doRotate, int orientation, int printLevel);

diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P1.txx b/src/INTERP_KERNEL/PlanarIntersectorP1P1.txx
index 6c28660547940b19f0c5c760588cb830760a1212..a9c11974a498b1efb0ce88b698322c83c30d083c 100644 (file)
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P1.txx
+++ b/src/INTERP_KERNEL/PlanarIntersectorP1P1.txx
@@ -20,7 +20,7 @@
 #ifndef __PLANARINTERSECTORP1P1_TXX__
 #define __PLANARINTERSECTORP1P1_TXX__
 
-#include "PlanarIntersector.hxx"
+#include "PlanarIntersector.txx"
 #include "PlanarIntersectorP1P1.hxx"
 #include "InterpolationUtils.hxx"
 #include <vector>

diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx b/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx
index 394d855b6b9c52044996697583a1ed1697f6ad83..1609a1bd5d425ef60af610ff5d8070ada8174815 100644 (file)
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx
+++ b/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx
@@ -33,7 +33,7 @@ namespace INTERP_KERNEL
    public:
     static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
     static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    using ConnType = typename MyMeshType::MyConnType;
+    typedef typename MyMeshType::MyConnType ConnType;
     static const NumberingPolicy numPol=MyMeshType::My_numPol;
   public:
     PlanarIntersectorP1P1PL(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double md3DSurf, double minDot3DSurf, double medianPlane, double precision, int orientation);

diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx b/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx
index 161ccbb4a2a51da6c1f8bc3dd13ea998fe4968e4..7cbb512af201320ae945cf702e6eea90175f2359 100644 (file)
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx
+++ b/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx
@@ -20,7 +20,7 @@
 #ifndef __PLANARINTERSECTORP1P1PL_TXX__
 #define __PLANARINTERSECTORP1P1PL_TXX__
 
-#include "PlanarIntersector.hxx"
+#include "PlanarIntersector.txx"
 #include "InterpolationUtils.hxx"
 #include "NormalizedGeometricTypes"
 #include "PlanarIntersectorP1P1PL.hxx"

diff --git a/src/INTERP_KERNEL/PointLocator2DIntersector.hxx b/src/INTERP_KERNEL/PointLocator2DIntersector.hxx
index 2bc8bcee66d861b3649b27219a707074cde873d9..ba3f44431aed93d1e0034d69b58fbb4eaea38b78 100644 (file)
--- a/src/INTERP_KERNEL/PointLocator2DIntersector.hxx
+++ b/src/INTERP_KERNEL/PointLocator2DIntersector.hxx
@@ -35,7 +35,7 @@ namespace INTERP_KERNEL
   public:
     static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
     static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    using ConnType = typename MyMeshType::MyConnType;
+    typedef typename MyMeshType::MyConnType ConnType;
     static const NumberingPolicy numPol=MyMeshType::My_numPol;
   public:
     PointLocator2DIntersector(const MyMeshType& meshT, const MyMeshType& meshS,

diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.hxx b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.hxx
index 2e8a6cdaefc0e5dfa29b4f0217292cbca3e5547c..e4cd815cd8fdb305778c04adc0409fd890102096 100644 (file)
--- a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.hxx
+++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.hxx
@@ -33,7 +33,7 @@ namespace INTERP_KERNEL
   public:
     static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
     static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    using ConnType = typename MyMeshType::MyConnType;
+    typedef typename MyMeshType::MyConnType ConnType;
     static const NumberingPolicy numPol=MyMeshType::My_numPol;
   public:
     PointLocator3DIntersectorP0P0(const MyMeshType& targetMesh, const MyMeshType& srcMesh, double precision);

diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx
index 8c3f64cbbe5bdf214a8743122e29a02ce9d02968..736cd0923e5df429f52f22671097be7c049dfc4d 100644 (file)
--- a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx
+++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx
@@ -20,12 +20,13 @@
 #ifndef __POINTLOCATOR3DINTERSECTORP0P0_TXX__
 #define __POINTLOCATOR3DINTERSECTORP0P0_TXX__
 
-#include "Intersector3DP0P0.hxx"
+#include "Intersector3DP0P0.txx"
 #include "InterpolationUtils.hxx"
 #include "InterpKernelUtilities.hxx"
 #include "NormalizedGeometricTypes"
 #include "CellModel.hxx"
 #include "PointLocator3DIntersectorP0P0.hxx"
+#include "VolSurfFormulae.hxx"
 
 #include "PointLocatorAlgos.txx"
 #include <vector>

diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.hxx b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.hxx
index c81b6dff4cac5f7b3842b573e3a65af92bb9ec7f..b98ff5e1a3f78e68a817454d25a314ef6a66d0c7 100644 (file)
--- a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.hxx
+++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.hxx
@@ -33,7 +33,7 @@ namespace INTERP_KERNEL
   public:
     static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
     static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    using ConnType = typename MyMeshType::MyConnType;
+    typedef typename MyMeshType::MyConnType ConnType;
     static const NumberingPolicy numPol=MyMeshType::My_numPol;
   public:
     PointLocator3DIntersectorP0P1(const MyMeshType& targetMesh, const MyMeshType& srcMesh, double precision);

diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx
index e34a1bdec0ea83890f36a93672499e1bd185733f..eeb577186b27a56fbda6d358d234dfe435741f18 100644 (file)
--- a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx
+++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx
@@ -20,7 +20,7 @@
 #ifndef __POINTLOCATOR3DINTERSECTORP0P1_TXX__
 #define __POINTLOCATOR3DINTERSECTORP0P1_TXX__
 
-#include "Intersector3DP0P1.hxx"
+#include "Intersector3DP0P1.txx"
 #include "InterpolationUtils.hxx"
 #include "InterpKernelUtilities.hxx"
 #include "NormalizedGeometricTypes"

diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.txx
index c2946e3e4ca7cbc8a874e2bb664346a780fa2fdd..58253b1bec913d555829d673cdbe277518efdfe3 100644 (file)
--- a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.txx
+++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.txx
@@ -20,13 +20,14 @@
 #ifndef __POINTLOCATOR3DINTERSECTORP1P0_TXX__
 #define __POINTLOCATOR3DINTERSECTORP1P0_TXX__
 
-#include "Intersector3DP1P0.hxx"
+#include "Intersector3DP1P0.txx"
 #include "InterpolationUtils.hxx"
 #include "InterpKernelUtilities.hxx"
 #include "NormalizedGeometricTypes"
 #include "PointLocator3DIntersectorP1P0.hxx"
 #include "CellModel.hxx"
 #include "PointLocatorAlgos.txx"
+#include "VolSurfFormulae.hxx"
 #include <vector>
 #include <cmath>
 

diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx
index 3bc6f6234178f44b92e089d39a00bc43afbc2521..8f8a8cba1eba3c87505a9b6716e22ff1b9424c9b 100644 (file)
--- a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx
+++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx
@@ -20,7 +20,7 @@
 #ifndef __POINTLOCATOR3DINTERSECTORP1P1_TXX__
 #define __POINTLOCATOR3DINTERSECTORP1P1_TXX__
 
-#include "Intersector3DP1P1.hxx"
+#include "Intersector3DP1P1.txx"
 #include "InterpolationUtils.hxx"
 #include "InterpKernelUtilities.hxx"
 #include "NormalizedGeometricTypes"

diff --git a/src/INTERP_KERNEL/Polyhedron3D2DIntersectorP0P0.txx b/src/INTERP_KERNEL/Polyhedron3D2DIntersectorP0P0.txx
index b037923c448f1504c32fd03f99dd01d9b9c19590..2c4b4b55699ecb9f5fde1c34942fab573fef63e0 100644 (file)
--- a/src/INTERP_KERNEL/Polyhedron3D2DIntersectorP0P0.txx
+++ b/src/INTERP_KERNEL/Polyhedron3D2DIntersectorP0P0.txx
@@ -20,7 +20,7 @@
 #define __POLYHEDRON3D2DINTERSECTORP0P0_TXX__
 
 #include "NormalizedGeometricTypes"
-#include "Intersector3DP0P0.hxx"
+#include "Intersector3DP0P0.txx"
 #include "Intersector3D.hxx"
 #include "InterpolationUtils.hxx"
 #include "CellModel.hxx"
@@ -28,7 +28,7 @@
 #include "Polyhedron3D2DIntersectorP0P0.hxx"
 #include "MeshUtils.hxx"
 #include <vector>
-#include "SplitterTetra.hxx"
+#include "SplitterTetra.txx"
 #include <set>
 
 

diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP0P0.txx b/src/INTERP_KERNEL/PolyhedronIntersectorP0P0.txx
index 0baa9ab74a03b99ef3a33de06fc561b12779a228..8ab82512af7655e3043ddd349b7c711f78fd325b 100644 (file)
--- a/src/INTERP_KERNEL/PolyhedronIntersectorP0P0.txx
+++ b/src/INTERP_KERNEL/PolyhedronIntersectorP0P0.txx
@@ -20,13 +20,14 @@
 #ifndef __POLYHEDRONINTERSECTORP0P0_TXX__
 #define __POLYHEDRONINTERSECTORP0P0_TXX__
 
-#include "NormalizedGeometricTypes"
-#include "Intersector3DP0P0.hxx"
-#include "InterpolationUtils.hxx"
 #include "PolyhedronIntersectorP0P0.hxx"
+
 #include <vector>
-#include "SplitterTetra.hxx"
 
+#include "NormalizedGeometricTypes"
+#include "Intersector3DP0P0.txx"
+#include "InterpolationUtils.hxx"
+#include "SplitterTetra.txx"
 
 namespace INTERP_KERNEL
 {

diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.hxx b/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.hxx
index fde4daa85522acaa5ee26bafc625f82b551dfe2d..2734090e752692f98b6764c6346b838df6dc68b2 100644 (file)
--- a/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.hxx
+++ b/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.hxx
@@ -41,7 +41,7 @@ namespace INTERP_KERNEL
   public:
     static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
     static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    using ConnType = typename MyMeshType::MyConnType;
+    typedef typename MyMeshType::MyConnType ConnType;
     static const NumberingPolicy numPol=MyMeshType::My_numPol;
   public:
 

diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.txx b/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.txx
index 9b5cc4acd24efc14b412853b4dd9082ab59692d4..f0c8106eebaf6ad57a1165abbd872a0661e360de 100644 (file)
--- a/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.txx
+++ b/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.txx
@@ -21,7 +21,7 @@
 #define __POLYHEDRONINTERSECTORP0P1_TXX__
 
 #include "NormalizedGeometricTypes"
-#include "Intersector3DP0P1.hxx"
+#include "Intersector3DP0P1.txx"
 #include "InterpolationUtils.hxx"
 #include "PolyhedronIntersectorP0P1.hxx"
 

diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP1P0.txx b/src/INTERP_KERNEL/PolyhedronIntersectorP1P0.txx
index 329ad9c983babd8d94560569299c3bf2fe7563a7..f51bccf045e064ca1555be8ff7a87b45fbf176ad 100644 (file)
--- a/src/INTERP_KERNEL/PolyhedronIntersectorP1P0.txx
+++ b/src/INTERP_KERNEL/PolyhedronIntersectorP1P0.txx
@@ -21,13 +21,13 @@
 #define __POLYHEDRONINTERSECTORP1P0_TXX__
 
 #include "NormalizedGeometricTypes"
-#include "Intersector3DP1P0.hxx"
+#include "Intersector3DP1P0.txx"
 #include "InterpKernelException.hxx"
 #include "InterpolationUtils.hxx"
-#include "Intersector3D.hxx"
+#include "Intersector3D.txx"
 #include "PolyhedronIntersectorP1P0.hxx"
 
-#include "SplitterTetra.hxx"
+#include "SplitterTetra.txx"
 #include <vector>
 
 namespace INTERP_KERNEL

diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.txx b/src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.txx
index 556069396dcf4407f12f3645c9822a30863766f9..03d55d5d3519168422a4b71dda995299ef3bcb4a 100644 (file)
--- a/src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.txx
+++ b/src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.txx
@@ -21,13 +21,13 @@
 #define __PolyhedronIntersectorP1P0Bary_TXX__
 
 #include "NormalizedGeometricTypes"
-#include "Intersector3DP1P0Bary.hxx"
+#include "Intersector3DP1P0Bary.txx"
 #include "InterpolationUtils.hxx"
-#include "Intersector3D.hxx"
+#include "Intersector3D.txx"
 #include "PolyhedronIntersectorP1P0Bary.hxx"
-#include "MeshUtils.hxx"
+// #include "MeshUtils.hxx"
 
-#include "SplitterTetra.hxx"
+#include "SplitterTetra.txx"
 #include <vector>
 
 namespace INTERP_KERNEL

diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx b/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx
index 31db1371a901616e8b60c416d83d12f3cee55d27..b303c65e2a26bf7da9bd4578892105224cc32bb5 100644 (file)
--- a/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx
+++ b/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx
@@ -20,14 +20,15 @@
 #ifndef __PolyhedronIntersectorP1P1_TXX__
 #define __PolyhedronIntersectorP1P1_TXX__
 
+#include "PolyhedronIntersectorP1P1.hxx"
+
 #include "NormalizedGeometricTypes"
-#include "Intersector3DP1P1.hxx"
+#include "Intersector3DP1P1.txx"
 #include "InterpolationUtils.hxx"
-#include "Intersector3D.hxx"
-#include "PolyhedronIntersectorP1P1.hxx"
-#include "MeshUtils.hxx"
+#include "Intersector3D.txx"
+// #include "MeshUtils.hxx"
 
-#include "SplitterTetra.hxx"
+#include "SplitterTetra.txx"
 #include <vector>
 #include <utility>
 

diff --git a/src/INTERP_KERNEL/SplitterTetra.txx b/src/INTERP_KERNEL/SplitterTetra.txx
index 26a60bae9af5b47948d89cbd4729ecd938ee7bad..ed9901e3ec673d2ec63d8e12891010ba5fa0050d 100644 (file)
--- a/src/INTERP_KERNEL/SplitterTetra.txx
+++ b/src/INTERP_KERNEL/SplitterTetra.txx
@@ -199,7 +199,7 @@ namespace INTERP_KERNEL
     const CellModel& cellModelCell=CellModel::GetCellModel(normCellType);
     ConnType nbOfNodes4Type=cellModelCell.isDynamic() ? _src_mesh.getNumberOfNodesOfElement(OTT<ConnType,numPol>::indFC(element)) : cellModelCell.getNumberOfNodes();
     // halfspace filtering
-    bool const isOutside[8] = {true, true, true, true, true, true, true, true};
+    bool isOutside[8] = {true, true, true, true, true, true, true, true};
     bool isTargetOutside = false;
 
     // calculate the coordinates of the nodes
@@ -609,8 +609,8 @@ namespace INTERP_KERNEL
       }
 
     // halfspace filtering
-    bool const isOutside[8] = {true, true, true, true, true, true, true, true};
-    bool const isStrictlyOutside[8] = {true, true, true, true, true, true, true, true};
+    bool isOutside[8] = {true, true, true, true, true, true, true, true};
+    bool isStrictlyOutside[8] = {true, true, true, true, true, true, true, true};
     bool isTargetStrictlyOutside = false;
     bool isTargetOutside = false;
 

diff --git a/src/INTERP_KERNELTest/InterpolationOptionsTest.cxx b/src/INTERP_KERNELTest/InterpolationOptionsTest.cxx
index 583b6c7765a4d766a378b69f7f4ad246774b84cf..9bcceed0718e15b05b64f8983861e34f06415cfb 100644 (file)
--- a/src/INTERP_KERNELTest/InterpolationOptionsTest.cxx
+++ b/src/INTERP_KERNELTest/InterpolationOptionsTest.cxx
@@ -20,7 +20,7 @@
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCouplingRefCountObject.hxx"
 #include "MEDCouplingMemArray.hxx"
-#include "MEDCouplingNormalizedUnstructuredMesh.hxx"
+#include "MEDCouplingNormalizedUnstructuredMesh.txx"
 #include "Interpolation2D.hxx"
 #include "MEDFileMesh.hxx"
 #include "MEDCouplingFieldDouble.hxx"

diff --git a/src/INTERP_KERNELTest/MeshTestToolkit.txx b/src/INTERP_KERNELTest/MeshTestToolkit.txx
index 87823536c27b9589dc8da6b26ffc42658bff9e32..4ccd830b6ea757e76b57060a34a941437b93966b 100644 (file)
--- a/src/INTERP_KERNELTest/MeshTestToolkit.txx
+++ b/src/INTERP_KERNELTest/MeshTestToolkit.txx
@@ -16,22 +16,22 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#ifndef __MESHTESTTOOLKI_TXX__
+#define __MESHTESTTOOLKI_TXX__
 
-#ifdef __MESH_TOOLKIT__
-#define __MESH_TOOLKIT__
+#include "MeshTestToolkit.hxx"
 
 #include "MCAuto.hxx"
 #include "MCIdType.hxx"
 #include "Interpolation2D.hxx"
 
-#include "MeshTestToolkit.hxx"
-
 #include "MEDFileMesh.hxx"
 
-#include "MEDCouplingNormalizedUnstructuredMesh.hxx"
+#include "MEDCouplingNormalizedUnstructuredMesh.txx"
 #include "MEDCouplingFieldDouble.hxx"
 
 #include "Interpolation3DSurf.hxx"
+#include "Interpolation2D.txx"
 #include "Interpolation3D.txx"
 #include "TestInterpKernelUtils.hxx"
 
@@ -74,11 +74,11 @@ namespace INTERP_TEST
   double MeshTestToolkit<SPACEDIM,MESHDIM>::sumRow(const IntersectionMatrix& m, int i) const
   {
     double vol = 0.0;
-    for(IntersectionMatrix::const_iterator iter = m.begin() ; iter != m.end() ; ++iter)
+    for(const auto & iter : m)
       {
-        if(iter->count(i) != 0.0)
+        if(iter.count(i) != 0.0)
           {
-            auto iter2 = iter->find(i);
+            auto iter2 = iter.find(i);
             vol += fabs(iter2->second);
           }
       }
@@ -129,11 +129,11 @@ namespace INTERP_TEST
   double MeshTestToolkit<SPACEDIM,MESHDIM>::sumVolume(const IntersectionMatrix& m) const
   {
     std::vector<double> volumes;
-    for(IntersectionMatrix::const_iterator iter = m.begin() ; iter != m.end() ; ++iter)
+    for(const auto & iter : m)
       {
-        for(auto iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2)
+        for(const auto & iter2 : iter)
           {
-            volumes.push_back(fabs(iter2->second));
+            volumes.push_back(fabs(iter2.second));
           }
       }
 

diff --git a/src/INTERP_KERNELTest/PerfTest.cxx b/src/INTERP_KERNELTest/PerfTest.cxx
index 8bb76bcb6831c1166e42adf6236fd835ff9497ef..a6868ec8fbe0d50ae1803a445e8bf327376d0638 100644 (file)
--- a/src/INTERP_KERNELTest/PerfTest.cxx
+++ b/src/INTERP_KERNELTest/PerfTest.cxx
@@ -27,7 +27,7 @@
 #include "Log.hxx"
 #include "VectorUtils.hxx"
 
-#include "MEDCouplingNormalizedUnstructuredMesh.hxx"
+#include "MEDCouplingNormalizedUnstructuredMesh.txx"
 
 #include <cassert>
 #include <string>

diff --git a/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx b/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx
index d09388eb5ebe3d61e2b01cc8bb0d3766de3d8420..51b6ea90fe81f05446c9b8d777d3b456fc150b4f 100644 (file)
--- a/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx
+++ b/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx
@@ -19,7 +19,7 @@
 
 #include "SingleElementPlanarTests.hxx"  
 #include "InterpolationUtils.hxx"
-#include "PolygonAlgorithms.hxx"
+#include "PolygonAlgorithms.txx"
 #include <cppunit/TestAssert.h>
 #include <deque>
 #include <vector>

diff --git a/src/INTERP_KERNELTest/ThreeDSurfProjectionTest.cxx b/src/INTERP_KERNELTest/ThreeDSurfProjectionTest.cxx
index 35f457bb062a8e43c3fc7e9d58a1d949e03fda2a..c895da5294828eb72fc1259f32ca5b02d7955a52 100644 (file)
--- a/src/INTERP_KERNELTest/ThreeDSurfProjectionTest.cxx
+++ b/src/INTERP_KERNELTest/ThreeDSurfProjectionTest.cxx
@@ -19,7 +19,7 @@
 
 #include "ThreeDSurfProjectionTest.hxx"
 #include "NormalizedUnstructuredMesh.hxx"
-#include "PlanarIntersector.hxx"
+#include "PlanarIntersector.txx"
 #include "MCIdType.hxx"
 #include <algorithm>
 #include <cppunit/TestAssert.h>
@@ -30,7 +30,7 @@ public:
   static const int MY_SPACEDIM=3;
   static const int MY_MESHDIM=3;
   static const INTERP_KERNEL::NumberingPolicy My_numPol=INTERP_KERNEL::ALL_C_MODE;
-  using MyConnType = mcIdType;
+  typedef mcIdType MyConnType;
 };
 
 class MyMatrixType

diff --git a/src/INTERP_KERNELTest/UnitTetra3D2DIntersectionTest.cxx b/src/INTERP_KERNELTest/UnitTetra3D2DIntersectionTest.cxx
index f2f8d2bcd8c69591d10c17642345cb9ea1e7112c..8f7294914ba38c9c85bfaf34b2773376984da29e 100644 (file)
--- a/src/INTERP_KERNELTest/UnitTetra3D2DIntersectionTest.cxx
+++ b/src/INTERP_KERNELTest/UnitTetra3D2DIntersectionTest.cxx
@@ -19,7 +19,7 @@
 
 #include "UnitTetra3D2DIntersectionTest.hxx"
 
-#include "SplitterTetra.hxx"
+#include "SplitterTetra.txx"
 #include "NormalizedGeometricTypes"
 #include "MCIdType.hxx"
 

diff --git a/src/INTERP_KERNELTest/UnitTetraIntersectionBaryTest.cxx b/src/INTERP_KERNELTest/UnitTetraIntersectionBaryTest.cxx
index 935e870d21f6ad1fc21081ac2fb61b6038645c38..308c3167eda52ce7511e3acbfeb0c330d15bafd5 100644 (file)
--- a/src/INTERP_KERNELTest/UnitTetraIntersectionBaryTest.cxx
+++ b/src/INTERP_KERNELTest/UnitTetraIntersectionBaryTest.cxx
@@ -24,7 +24,7 @@
 #include "UnitTetraIntersectionBaryTest.hxx"
 
 #include "TransformedTriangle.hxx"
-#include "SplitterTetra.hxx"
+#include "SplitterTetra.txx"
 #include "InterpKernelException.hxx"
 #include "UnitTetraIntersectionBary.hxx"
 #include "TetraAffineTransform.hxx"

diff --git a/src/MEDCoupling/MEDCoupling1GTUMesh.cxx b/src/MEDCoupling/MEDCoupling1GTUMesh.cxx
index b9ce0a1768a7850ce40a223c967697bd6d907ab0..e289edb91c8c11e790af666986e7225f3303a176 100644 (file)
--- a/src/MEDCoupling/MEDCoupling1GTUMesh.cxx
+++ b/src/MEDCoupling/MEDCoupling1GTUMesh.cxx
@@ -20,7 +20,7 @@
 
 #include "CellModel.hxx"
 #include "MEDCouplingPointSet.hxx"
-#include "MEDCoupling1GTUMesh.hxx"
+#include "MEDCoupling1GTUMesh.txx"
 #include "MCAuto.hxx"
 #include "MCIdType.hxx"
 #include "MCType.hxx"
@@ -35,7 +35,7 @@
 #include "MEDCouplingCMesh.hxx"
 
 #include "NormalizedGeometricTypes"
-#include "SplitterTetra.hxx"
+#include "SplitterTetra.txx"
 #include "DiameterCalculator.hxx"
 #include "OrientationInverter.hxx"
 #include "InterpKernelAutoPtr.hxx"

diff --git a/src/MEDCoupling/MEDCouplingFieldDiscretizationOnNodesFE.cxx b/src/MEDCoupling/MEDCouplingFieldDiscretizationOnNodesFE.cxx
index b5674b3f7e7c8abfaef1883c600ce53aaaad7e24..89fbd91cd70e9d8db6d3cb33a645793efbd7a023 100644 (file)
--- a/src/MEDCoupling/MEDCouplingFieldDiscretizationOnNodesFE.cxx
+++ b/src/MEDCoupling/MEDCouplingFieldDiscretizationOnNodesFE.cxx
@@ -26,7 +26,7 @@
 #include "MEDCouplingGaussLocalization.hxx"
 #include "MEDCouplingMemArray.hxx"
 #include "MCType.hxx"
-#include "MEDCouplingNormalizedUnstructuredMesh.hxx"
+#include "MEDCouplingNormalizedUnstructuredMesh.txx"
 #include "BBTreeStandAlone.txx"
 #include "InterpKernelException.hxx"
 #include "InterpKernelDenseMatrix.hxx"

diff --git a/src/MEDCoupling/MEDCouplingFieldDouble.cxx b/src/MEDCoupling/MEDCouplingFieldDouble.cxx
index 7dd4fd9db7177d45049e0c1ed79f8e78aa277ed8..18f246d4524449e9152d837424a1cf1261a0af56 100644 (file)
--- a/src/MEDCoupling/MEDCouplingFieldDouble.cxx
+++ b/src/MEDCoupling/MEDCouplingFieldDouble.cxx
@@ -19,7 +19,7 @@
 // Author : Anthony Geay (EDF R&D)
 
 #include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingFieldT.hxx"
+#include "MEDCouplingFieldT.txx"
 #include "MCAuto.hxx"
 #include "MCType.hxx"
 #include "MEDCouplingField.hxx"

diff --git a/src/MEDCoupling/MEDCouplingFieldFloat.cxx b/src/MEDCoupling/MEDCouplingFieldFloat.cxx
index 3b5ea9a7aa9aa817c04b5efc42397e74abcfba68..0702daff5ac66f956ced10132cb7182b347cc453 100644 (file)
--- a/src/MEDCoupling/MEDCouplingFieldFloat.cxx
+++ b/src/MEDCoupling/MEDCouplingFieldFloat.cxx
@@ -19,7 +19,7 @@
 // Author : Anthony GEAY (EDF R&D)
 
 #include "MEDCouplingFieldFloat.hxx"
-#include "MEDCouplingFieldT.hxx"
+#include "MEDCouplingFieldT.txx"
 #include "MEDCouplingFieldDiscretization.hxx"
 #include "MCAuto.hxx"
 #include "MCType.hxx"

diff --git a/src/MEDCoupling/MEDCouplingFieldInt32.cxx b/src/MEDCoupling/MEDCouplingFieldInt32.cxx
index 0342cceaea3d68098fc80a371fa5bbd6c1047911..363a25636adab79c9b6434b2c31fda5358e829e6 100644 (file)
--- a/src/MEDCoupling/MEDCouplingFieldInt32.cxx
+++ b/src/MEDCoupling/MEDCouplingFieldInt32.cxx
@@ -23,7 +23,7 @@
 #include "MEDCouplingFieldDiscretization.hxx"
 #include "MCAuto.hxx"
 #include "MEDCouplingFieldInt64.hxx"
-#include "MEDCouplingFieldT.hxx"
+#include "MEDCouplingFieldT.txx"
 #include "MEDCouplingFieldDouble.hxx"
 #include "MEDCouplingFieldFloat.hxx"
 #include "MEDCouplingFieldTemplate.hxx"
@@ -105,4 +105,4 @@ MEDCouplingFieldInt64 *MEDCouplingFieldInt32::convertToInt64Field() const
 MEDCouplingFieldFloat *MEDCouplingFieldInt32::convertToFloatField() const
 {
   return ConvertToUField<float>(this);
-}
\ No newline at end of file
+}

diff --git a/src/MEDCoupling/MEDCouplingFieldInt64.cxx b/src/MEDCoupling/MEDCouplingFieldInt64.cxx
index 4c44e0c688519648118b8aab11b19d38fc3e3eaf..96f0860084d54502cbc0fad062235cb78378604b 100644 (file)
--- a/src/MEDCoupling/MEDCouplingFieldInt64.cxx
+++ b/src/MEDCoupling/MEDCouplingFieldInt64.cxx
@@ -19,7 +19,7 @@
 // Author : Anthony Geay (EDF R&D)
 
 #include "MEDCouplingFieldInt64.hxx"
-#include "MEDCouplingFieldT.hxx"
+#include "MEDCouplingFieldT.txx"
 #include "MCType.hxx"
 #include "MEDCouplingFieldDiscretization.hxx"
 #include "MCAuto.hxx"

diff --git a/src/MEDCoupling/MEDCouplingIMesh.cxx b/src/MEDCoupling/MEDCouplingIMesh.cxx
index cd781a447bc53353c466b51e3cd9a8b127110440..7e4462c02f6085997d7aaee3a768e5b763306786 100644 (file)
--- a/src/MEDCoupling/MEDCouplingIMesh.cxx
+++ b/src/MEDCoupling/MEDCouplingIMesh.cxx
@@ -23,7 +23,7 @@
 #include "MCAuto.hxx"
 #include "MCIdType.hxx"
 #include "MEDCouplingCMesh.hxx"
-#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 #include "MEDCouplingFieldDouble.hxx"
 #include "MEDCouplingStructuredMesh.hxx"
 #include "MEDCouplingMesh.hxx"

diff --git a/src/MEDCoupling/MEDCouplingMap.cxx b/src/MEDCoupling/MEDCouplingMap.cxx
index 7a9779b17a1d94d4fd03b21a70c679ad99094a00..7ef340dbe7c7223c2e758fc3dde25338f3a9a252 100644 (file)
--- a/src/MEDCoupling/MEDCouplingMap.cxx
+++ b/src/MEDCoupling/MEDCouplingMap.cxx
@@ -18,7 +18,7 @@
 //
 // Author : Anthony Geay (EDF R&D)
 
-#include "MEDCouplingMap.hxx"
+#include "MEDCouplingMap.txx"
 #include "MCIdType.hxx"
 
 using namespace MEDCoupling;

diff --git a/src/MEDCoupling/MEDCouplingMemArray.cxx b/src/MEDCoupling/MEDCouplingMemArray.cxx
index 077cb32e12f1d396a91fc8902af9acf1b989a4f9..c9d533df1b8d60516beb2c9acfa3cc5528e38dab 100644 (file)
--- a/src/MEDCoupling/MEDCouplingMemArray.cxx
+++ b/src/MEDCoupling/MEDCouplingMemArray.cxx
@@ -18,6 +18,7 @@
 //
 // Author : Anthony Geay (EDF R&D)
 
+#include "MEDCouplingMemArray.txx"
 
 #include "BBTree.txx"
 #include "BBTreePts.txx"
@@ -26,13 +27,10 @@
 #include "InterpKernelException.hxx"
 #include "InterpKernelExprParser.hxx"
 
-#include "InterpKernelAutoPtr.hxx"
 #include "InterpKernelGeo2DEdgeArcCircle.hxx"
-#include "InterpKernelAutoPtr.hxx"
 #include "InterpKernelGeo2DNode.hxx"
 #include "InterpKernelGeo2DEdgeLin.hxx"
 #include "MEDCoupling.hxx"
-#include "MEDCouplingMemArray.hxx"
 #include "MCIdType.hxx"
 #include "MCType.hxx"
 #include "MEDCouplingRefCountObject.hxx"

diff --git a/src/MEDCoupling/MEDCouplingMemArray.txx b/src/MEDCoupling/MEDCouplingMemArray.txx
index 116817dc48110b8cd59232f02efa3c4a2a4f1f96..ab19802b7b17d670cd9d4ac24e30a9090c9d1a95 100644 (file)
--- a/src/MEDCoupling/MEDCouplingMemArray.txx
+++ b/src/MEDCoupling/MEDCouplingMemArray.txx
@@ -22,7 +22,7 @@
 #define __PARAMEDMEM_MEDCOUPLINGMEMARRAY_TXX__
 
 #include "MCType.hxx"
-#include "MEDCouplingMap.hxx"
+#include "MEDCouplingMap.txx"
 #include "MEDCouplingMemArray.hxx"
 #include "MEDCouplingRefCountObject.hxx"
 #include "MEDCouplingTraits.hxx"

diff --git a/src/MEDCoupling/MEDCouplingMemArrayChar.cxx b/src/MEDCoupling/MEDCouplingMemArrayChar.cxx
index 524b8ef40d2984eaa299b024026cd8aba103a068..7415ff7a8a3f26d1806a2fc129d8ddc1e3441145 100644 (file)
--- a/src/MEDCoupling/MEDCouplingMemArrayChar.cxx
+++ b/src/MEDCoupling/MEDCouplingMemArrayChar.cxx
@@ -18,7 +18,7 @@
 //
 // Author : Anthony Geay (CEA/DEN)
 
-#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 #include "MCIdType.hxx"
 #include "MCType.hxx"
 #include "MCAuto.hxx"

diff --git a/src/MEDCoupling/MEDCouplingMemArrayFloat.cxx b/src/MEDCoupling/MEDCouplingMemArrayFloat.cxx
index 505f5e070031b23d4ea154ddf3188710645b6cb1..6aa588162e38be6a71d06dfbd13a7c7eb2a5202e 100644 (file)
--- a/src/MEDCoupling/MEDCouplingMemArrayFloat.cxx
+++ b/src/MEDCoupling/MEDCouplingMemArrayFloat.cxx
@@ -18,7 +18,7 @@
 //
 // Author : Anthony Geay (EDF R&D)
 
-#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 #include "MCType.hxx"
 #include <string>
 #include <ostream>

diff --git a/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.txx b/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.txx
index 62cbfc322773375a9af8aec7252bad009756dadb..1454066251fd50332d756c61556d61b25bafc696 100644 (file)
--- a/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.txx
+++ b/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.txx
@@ -21,10 +21,10 @@
 #ifndef __MEDCOUPLINGNORMALIZEDUNSTRUCTUREDMESH_TXX__
 #define __MEDCOUPLINGNORMALIZEDUNSTRUCTUREDMESH_TXX__
 
-#include "MCIdType.hxx"
 #include "MEDCouplingNormalizedUnstructuredMesh.hxx"
-#include "InterpKernelAssert.hxx"
 
+#include "MCIdType.hxx"
+#include "InterpKernelAssert.hxx"
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCoupling1GTUMesh.hxx"
 #include "MEDCouplingMemArray.hxx"

diff --git a/src/MEDCoupling/MEDCouplingPointSet.cxx b/src/MEDCoupling/MEDCouplingPointSet.cxx
index da805d120a8b9eb90825ed8ed6adff6423d9eaf2..745be33d4843e860ec755342e31880d69d4233d1 100644 (file)
--- a/src/MEDCoupling/MEDCouplingPointSet.cxx
+++ b/src/MEDCoupling/MEDCouplingPointSet.cxx
@@ -29,7 +29,7 @@
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCouplingMemArray.hxx"
 #include "NormalizedUnstructuredMesh.hxx"
-#include "PlanarIntersector.hxx"
+#include "PlanarIntersector.txx"
 #include "InterpKernelGeo2DQuadraticPolygon.hxx"
 #include "InterpKernelGeo2DNode.hxx"
 #include "DirectedBoundingBox.hxx"

diff --git a/src/MEDCoupling/MEDCouplingRemapper.cxx b/src/MEDCoupling/MEDCouplingRemapper.cxx
index 0191c231ea5c6f0981c4b2e37f9ac43aa1f61af6..e9b24e662810f114915e9fa1ce7f43b6422910ce 100644 (file)
--- a/src/MEDCoupling/MEDCouplingRemapper.cxx
+++ b/src/MEDCoupling/MEDCouplingRemapper.cxx
@@ -19,7 +19,7 @@
 // Author : Anthony Geay (CEA/DEN)
 
 #include "MEDCouplingRemapper.hxx"
-#include "Interpolation.hxx"
+#include "Interpolation.txx"
 #include "MCAuto.hxx"
 #include "InterpolationOptions.hxx"
 #include "MCType.hxx"
@@ -42,7 +42,7 @@
 #include "MEDCouplingMappedExtrudedMesh.hxx"
 #include "MEDCouplingCMesh.hxx"
 #include "MEDCouplingNatureOfFieldEnum"
-#include "MEDCouplingNormalizedUnstructuredMesh.hxx"
+#include "MEDCouplingNormalizedUnstructuredMesh.txx"
 #include "MEDCouplingNormalizedCartesianMesh.hxx"
 #include "MEDCouplingNormalizedCartesianMesh.txx"
 #include "MEDCouplingFieldDiscretizationOnNodesFE.hxx"

diff --git a/src/MEDCoupling/MEDCouplingRemapper.hxx b/src/MEDCoupling/MEDCouplingRemapper.hxx
index c53688e6ed7b7a88bb8de9f827b78748ad33fe4a..564c387a9a6742a7a01e48703ee0a173b89bbbcc 100644 (file)
--- a/src/MEDCoupling/MEDCouplingRemapper.hxx
+++ b/src/MEDCoupling/MEDCouplingRemapper.hxx
@@ -42,13 +42,13 @@ namespace MEDCoupling
 
 namespace MEDCoupling
 {
-  using InterpolationMatrixPolicy = enum
+  typedef enum
   {
     IK_ONLY_PREFERED = 0,
     NOT_IK_ONLY_PREFERED = 1,
     IK_ONLY_FORCED = 2,
     NOT_IK_ONLY_FORCED =3
-  };
+  } InterpolationMatrixPolicy;
 
   class MEDCouplingRemapper : public TimeLabel, public INTERP_KERNEL::InterpolationOptions
   {

diff --git a/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx b/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
index 49913aa609da4d0e34084ad9172470f7af2d2778..ebeefe66261e942ad28a97bc32a4100e27731964 100644 (file)
--- a/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
+++ b/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
@@ -18,12 +18,13 @@
 //
 // Author : Anthony Geay (CEA/DEN)
 
+#include "MEDCouplingTimeDiscretization.txx"
+
 #include "MCAuto.hxx"
 #include "MCIdType.hxx"
 #include "MCType.hxx"
 #include "MEDCouplingMemArray.hxx"
 #include "MEDCouplingMesh.hxx"
-#include "MEDCouplingTimeDiscretization.hxx"
 #include "MEDCouplingRefCountObject.hxx"
 #include "MEDCouplingTimeLabel.hxx"
 

diff --git a/src/MEDCoupling/MEDCouplingTimeDiscretization.txx b/src/MEDCoupling/MEDCouplingTimeDiscretization.txx
index c0307fd5aa5522c01a4fe574b24428c9b8757603..f48d9b77297bbc8415032f1f63d01e6276ec5c37 100644 (file)
--- a/src/MEDCoupling/MEDCouplingTimeDiscretization.txx
+++ b/src/MEDCoupling/MEDCouplingTimeDiscretization.txx
@@ -26,7 +26,7 @@
 #include "MEDCouplingTimeDiscretization.hxx"
 #include "MEDCouplingTraits.hxx"
 #include "InterpKernelException.hxx"
-#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 
 #include <algorithm>
 #include <cmath>

diff --git a/src/MEDCoupling/MEDCouplingUMesh.cxx b/src/MEDCoupling/MEDCouplingUMesh.cxx
index 753a2f353612da88a09a16332f6e87f281400866..853a68b5ca726ea19750ab40528694c6d257a7ee 100644 (file)
--- a/src/MEDCoupling/MEDCouplingUMesh.cxx
+++ b/src/MEDCoupling/MEDCouplingUMesh.cxx
@@ -30,10 +30,10 @@
 #include "MEDCouplingPointSet.hxx"
 #include "MEDCouplingRefCountObject.hxx"
 #include "MEDCouplingMesh.hxx"
-#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 #include "MEDCouplingSkyLineArray.hxx"
 #include "CellModel.hxx"
-#include "MEDCouplingUMesh.hxx"
+#include "MEDCouplingUMesh.txx"
 #include "NormalizedGeometricTypes"
 #include "NormalizedUnstructuredMesh.hxx"
 #include "VolSurfFormulae.hxx"
@@ -41,7 +41,7 @@
 #include "VolSurfUser.txx"
 #include "InterpolationUtils.hxx"
 #include "BBTreeDst.txx"
-#include "SplitterTetra.hxx"
+#include "SplitterTetra.txx"
 #include "DirectedBoundingBox.hxx"
 #include "InterpKernelMatrixTools.hxx"
 #include "InterpKernelMeshQuality.hxx"

diff --git a/src/MEDCoupling/MEDCouplingUMesh_internal.cxx b/src/MEDCoupling/MEDCouplingUMesh_internal.cxx
index d7a800f30c09441f63dd1ef4e44943fbebfcb9a9..d5a2096cc46a540f30bdc6d08644871cdf85cc69 100644 (file)
--- a/src/MEDCoupling/MEDCouplingUMesh_internal.cxx
+++ b/src/MEDCoupling/MEDCouplingUMesh_internal.cxx
@@ -30,7 +30,7 @@
 #include "CellModel.hxx"
 #include "NormalizedGeometricTypes"
 #include "VolSurfUser.hxx"
-#include "SplitterTetra.hxx"
+#include "SplitterTetra.txx"
 #include "InterpKernelGeo2DEdgeArcCircle.hxx"
 #include "InterpKernelAutoPtr.hxx"
 #include "InterpKernelGeo2DNode.hxx"

diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx
index 253ff88dbb00931421a37068a75e71f8e74c5a0b..e20fd2fd6ae145bc8f7903b57d88d792d58e0246 100644 (file)
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx
@@ -19,13 +19,14 @@
 // Author : Anthony Geay (CEA/DEN)
 
 #include "MCType.hxx"
-#include "Interpolation2D1D.hxx"
+#include "Interpolation.txx"
+#include "Interpolation2D1D.txx"
 #include "InterpolationOptions.hxx"
 #include "Log.hxx"
-#include "Interpolation2D3D.hxx"
+#include "Interpolation2D3D.txx"
 #include "MEDCouplingBasicsTest.hxx"
 #include "MEDCouplingRefCountObject.hxx"
-#include "MEDCouplingNormalizedUnstructuredMesh.hxx"
+#include "MEDCouplingNormalizedUnstructuredMesh.txx"
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCouplingMappedExtrudedMesh.hxx"
 #include "MEDCouplingFieldDouble.hxx"

diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
index 395bc3f915dbc7214a055c5bff50b8efb1c9e4bc..14b4eea82c8e549063533109280a86d9d9100ac5 100644 (file)
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
@@ -19,7 +19,7 @@
 // Author : Anthony Geay (CEA/DEN)
 
 #include "MEDCouplingBasicsTest1.hxx"
-#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 #include "MEDCouplingRefCountObject.hxx"
 #include "InterpKernelException.hxx"
 #include "MCAuto.hxx"

diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx
index 9d9051cdf92aaa6ff934917ef116d31a7c168c78..1bb5c4a9dbce4cd84c4e27c3b0e62ffe073ccace 100644 (file)
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx
@@ -29,7 +29,7 @@
 #include "MEDCouplingCMesh.hxx"
 #include "MEDCouplingMappedExtrudedMesh.hxx"
 #include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 #include "MEDCouplingGaussLocalization.hxx"
 #include "NormalizedGeometricTypes"
 

diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx
index fb42ab5fad56ecfa73705182a0be82c0516bbcc7..1d771b8cc14805ce387e64f23a00c298e6bcaf47 100644 (file)
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx
@@ -19,7 +19,7 @@
 // Author : Anthony Geay (CEA/DEN)
 
 #include "MEDCouplingBasicsTestInterp.hxx"
-#include "MEDCouplingNormalizedUnstructuredMesh.hxx"
+#include "MEDCouplingNormalizedUnstructuredMesh.txx"
 #include "Interpolation2D.hxx"
 #include "InterpolationOptions.hxx"
 #include "MCType.hxx"

diff --git a/src/MEDCoupling/Test/MEDCouplingExamplesTest.cxx b/src/MEDCoupling/Test/MEDCouplingExamplesTest.cxx
index c539548fb267b05997a17004f4a310e58d354d42..84930c5099ac3d01cfd668bf1f0abe0692f24428 100644 (file)
--- a/src/MEDCoupling/Test/MEDCouplingExamplesTest.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingExamplesTest.cxx
@@ -29,7 +29,7 @@
 #include "MEDCouplingCMesh.hxx"
 #include "MEDCouplingMappedExtrudedMesh.hxx"
 #include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 #include "MEDCouplingMultiFields.hxx"
 #include <vector>
 #include <stdio.h>

diff --git a/src/MEDCoupling/Test/TestMEDCoupling.cxx b/src/MEDCoupling/Test/TestMEDCoupling.cxx
index 6584358e5e372ab8346d672cf1492339e5bd718d..9a72bbbf44914283305c2e03c295b4b12a949cb3 100644 (file)
--- a/src/MEDCoupling/Test/TestMEDCoupling.cxx
+++ b/src/MEDCoupling/Test/TestMEDCoupling.cxx
@@ -33,3 +33,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION( MEDCoupling::MEDCouplingBasicsTest4 );
 CPPUNIT_TEST_SUITE_REGISTRATION( MEDCoupling::MEDCouplingBasicsTest5 );
 CPPUNIT_TEST_SUITE_REGISTRATION( MEDCoupling::MEDCouplingBasicsTestInterp );
 
+#include "BasicMainTest.hxx"

diff --git a/src/MEDCoupling/Test/TestMEDCouplingRemapper.cxx b/src/MEDCoupling/Test/TestMEDCouplingRemapper.cxx
index eaf56a89961df13475155d16ff26aa62ed2a4a96..c8154bca8a8419454e3995c657ad9cae5675e83b 100644 (file)
--- a/src/MEDCoupling/Test/TestMEDCouplingRemapper.cxx
+++ b/src/MEDCoupling/Test/TestMEDCouplingRemapper.cxx
@@ -23,3 +23,4 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( MEDCoupling::MEDCouplingRemapperTest );
 
+#include "BasicMainTest.hxx"

diff --git a/src/MEDCoupling_Swig/MEDCouplingCommon.i b/src/MEDCoupling_Swig/MEDCouplingCommon.i
index 7343254f6f09547ac64940aa593495b6f13401a3..1a9534a5821cf75526228c3eeb7e56d7bca7a94c 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingCommon.i
+++ b/src/MEDCoupling_Swig/MEDCouplingCommon.i
@@ -57,6 +57,7 @@
 
 #include "InterpKernelAutoPtr.hxx"
 #include "BoxSplittingOptions.hxx"
+#include "MEDCouplingNatureOfField.hxx"
 
 using namespace MEDCoupling;
 using namespace INTERP_KERNEL;

diff --git a/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx b/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx
index 5db25568dfe68e02ed247183033ee32335e9b80a..2a9179639e2f75901a8e35d0779657dea94b226b 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx
+++ b/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx
@@ -22,7 +22,7 @@
 #define __MEDCOUPLINGDATAARRAYTRAITS_HXX__
 
 #include "MCType.hxx"
-#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 
 #include <Python.h>
 

diff --git a/src/MEDLoader/MEDFileData.hxx b/src/MEDLoader/MEDFileData.hxx
index b8a8d30ab217d9eaa5c94a707938b6710f7d6e5f..08f180fedc822b8b774b117efda2e50c2f3bb564 100644 (file)
--- a/src/MEDLoader/MEDFileData.hxx
+++ b/src/MEDLoader/MEDFileData.hxx
@@ -29,7 +29,7 @@
 #include "MEDFileMesh.hxx"
 #include "MEDFileMeshSupport.hxx"
 #include "MEDFileStructureElement.hxx"
-#include "MEDFileUtilities.hxx"
+#include "MEDFileUtilities.txx"
 #include "MEDLoaderDefines.hxx"
 #include <string>
 #include "med.h"

diff --git a/src/MEDLoader/MEDFileEquivalence.cxx b/src/MEDLoader/MEDFileEquivalence.cxx
index 65103001bc7435a1debee202a147a9777fb31fb5..2a07c1d55c7b4237f919030f1977829e7b2a704c 100644 (file)
--- a/src/MEDLoader/MEDFileEquivalence.cxx
+++ b/src/MEDLoader/MEDFileEquivalence.cxx
@@ -25,7 +25,6 @@
 #include "CellModel.hxx"
 #include "MCType.hxx"
 #include "MEDFileSafeCaller.txx"
-#include "MEDCouplingMemArray.hxx"
 #include "MEDLoaderBase.hxx"
 #include "MEDFileMesh.hxx"
 #include "InterpKernelAutoPtr.hxx"

diff --git a/src/MEDLoader/MEDFileField1TS.cxx b/src/MEDLoader/MEDFileField1TS.cxx
index 5c2b051866605d13c6a9d79f8fb3bbfb42a30872..1927a5f91d0b77891e1f9b7b53e8c66231b43873 100644 (file)
--- a/src/MEDLoader/MEDFileField1TS.cxx
+++ b/src/MEDLoader/MEDFileField1TS.cxx
@@ -38,6 +38,7 @@
 #include "MEDFileSafeCaller.txx"
 #include "MEDFileUtilities.hxx"
 #include "MEDLoaderBase.hxx"
+#include "MEDFileField.txx"
 
 #include "MEDCouplingFieldTemplate.hxx"
 #include "MEDCouplingFieldDouble.hxx"

diff --git a/src/MEDLoader/MEDFileField1TS.hxx b/src/MEDLoader/MEDFileField1TS.hxx
index ac1a3abc9d925815477568e98cc8571f76250d3e..394ab88d03e540d578f360a6421ef3cd9ec9e470 100644 (file)
--- a/src/MEDLoader/MEDFileField1TS.hxx
+++ b/src/MEDLoader/MEDFileField1TS.hxx
@@ -26,7 +26,7 @@
 #include "MEDCouplingMemArray.hxx"
 #include "MCAuto.hxx"
 #include "MEDCouplingTraits.hxx"
-#include "MEDFileUtilities.hxx"
+#include "MEDFileUtilities.txx"
 #include "MEDLoaderDefines.hxx"
 #include "MEDFileFieldGlobs.hxx"
 #include "MEDFileFieldInternal.hxx"

diff --git a/src/MEDLoader/MEDFileFieldMultiTS.cxx b/src/MEDLoader/MEDFileFieldMultiTS.cxx
index 057681792c3f43ce2fd88651f90d805fd157b646..46dd6b1505167eee75251eae01031c562f1cc926 100644 (file)
--- a/src/MEDLoader/MEDFileFieldMultiTS.cxx
+++ b/src/MEDLoader/MEDFileFieldMultiTS.cxx
@@ -19,6 +19,7 @@
 // Author : Anthony Geay (EDF R&D)
 
 #include "MEDFileFieldMultiTS.hxx"
+#include "MEDFileField.txx"
 #include "MCType.hxx"
 #include "MEDFileFieldGlobs.hxx"
 #include "MEDFileEntities.hxx"

diff --git a/src/MEDLoader/MEDFileFieldMultiTS.hxx b/src/MEDLoader/MEDFileFieldMultiTS.hxx
index 16e32d669131f20c3083e20088f3b61fd6228da9..a954e969677a19c066e6a810f8538faf83d23e4b 100644 (file)
--- a/src/MEDLoader/MEDFileFieldMultiTS.hxx
+++ b/src/MEDLoader/MEDFileFieldMultiTS.hxx
@@ -29,7 +29,7 @@
 #include "MEDFileField1TS.hxx"
 #include "MEDFileFieldGlobs.hxx"
 #include "MEDLoaderTraits.hxx"
-#include "MEDFileUtilities.hxx"
+#include "MEDFileUtilities.txx"
 #include <string>
 #include "med.h"
 #include <vector>

diff --git a/src/MEDLoader/MEDFileMesh.hxx b/src/MEDLoader/MEDFileMesh.hxx
index 0d898fee4201323847ef8e6e6dfe362f23a3d517..0cd2f191d4df9685be80fee25747b37205b0a28d 100644 (file)
--- a/src/MEDLoader/MEDFileMesh.hxx
+++ b/src/MEDLoader/MEDFileMesh.hxx
@@ -22,7 +22,7 @@
 #define __MEDFILEMESH_HXX__
 
 #include "MEDCouplingRefCountObject.hxx"
-#include "MEDFileUtilities.hxx"
+#include "MEDFileUtilities.txx"
 #include "MEDCouplingMemArray.hxx"
 #include "MCType.hxx"
 #include "MEDCouplingMesh.hxx"

diff --git a/src/MEDLoader/MEDFileMeshLL.cxx b/src/MEDLoader/MEDFileMeshLL.cxx
index cce318be9b01cd8b677948037cd13fc26894a0eb..f2341131f25a3aa903503291111dee94af2b505c 100644 (file)
--- a/src/MEDLoader/MEDFileMeshLL.cxx
+++ b/src/MEDLoader/MEDFileMeshLL.cxx
@@ -21,11 +21,11 @@
 #include "MEDFileMeshLL.hxx"
 #include "MEDCouplingCurveLinearMesh.hxx"
 #include "MEDCouplingMesh.hxx"
-#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 #include "MEDFileBasis.hxx"
 #include "MCType.hxx"
 #include "MCAuto.hxx"
-#include "MEDCouplingMap.hxx"
+#include "MEDCouplingMap.txx"
 #include "MEDCouplingPartDefinition.hxx"
 #include "MEDCouplingRefCountObject.hxx"
 #include "MCIdType.hxx"

diff --git a/src/MEDLoader/MEDFileParameter.hxx b/src/MEDLoader/MEDFileParameter.hxx
index df971f16373d02621f3a47ac676e8ffdc8b14988..ff8844fa4f8127d68f8405f6bc6d5b5f6a873e75 100644 (file)
--- a/src/MEDLoader/MEDFileParameter.hxx
+++ b/src/MEDLoader/MEDFileParameter.hxx
@@ -22,7 +22,7 @@
 #define __MEDFILEPARAMETER_HXX__
 
 #include "MEDCouplingRefCountObject.hxx"
-#include "MEDFileUtilities.hxx"
+#include "MEDFileUtilities.txx"
 #include "MEDLoaderDefines.hxx"
 #include "MEDCouplingMemArray.hxx"
 #include "MCAuto.hxx"

diff --git a/src/MEDLoader/libmesh5.hxx b/src/MEDLoader/libmesh5.hxx
index ba433cf9f806fd4ff65a5172ceeb548befe10d5d..f1e6da8b35637a21f4e5b606551a4f7dd19f8c0d 100644 (file)
--- a/src/MEDLoader/libmesh5.hxx
+++ b/src/MEDLoader/libmesh5.hxx
@@ -58,14 +58,14 @@ extern const char* GmfKwdFmt[ GmfMaxKwd + 1 ][4];
 /* Structures                                                                                           */
 /*----------------------------------------------------------*/
 namespace  MeshFormat {
-using KwdSct = struct
+typedef struct
 {
     int typ, SolSiz, NmbWrd, NmbLin, NmbTyp, TypTab[ GmfMaxTyp ];
     long pos;
     char fmt[ GmfMaxTyp*9 ];
-};
+} KwdSct;
 
-using GmfMshSct = struct
+typedef struct
 {
     int dim, ver, mod, typ, cod, pos;
     long NexKwdPos, siz;
@@ -77,7 +77,7 @@ using GmfMshSct = struct
     char FilNam[ GmfStrSiz ];
     double DblBuf[1000/8];
     unsigned char blk[ BufSiz + 1000 ];
-};
+} GmfMshSct;
 
 
 

diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx
index 3e6c74d7f21c5df7b40200c8e222ad7d4cf864a3..908f7bfea1dc6e58de371e1078cf69a97ca20204 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx
@@ -2262,7 +2262,7 @@ void MEDPARTITIONER::MeshCollection::setDomainNames(const std::string& name)
 {
   for (int i=0; i<_topology->nbDomain(); i++)
     {
-      std::ostringstream const oss;
+      std::ostringstream oss;
       oss<<name<<"_"<<i;
       if (!isParallelMode() || _domain_selector->isMyDomain(i))
         _mesh[i]->setName(oss.str());

diff --git a/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx b/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx
index 72d9345f6fe07a51696fe868749178785993a542..18f35be7d133c5c44a115c93aa0c80965302034c 100644 (file)
--- a/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx
+++ b/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx
@@ -34,7 +34,7 @@
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCouplingMappedExtrudedMesh.hxx"
 #include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 #include "MEDCouplingMultiFields.hxx"
 #include "NormalizedGeometricTypes"
 

diff --git a/src/ParaMEDMEM/InterpolationMatrix.cxx b/src/ParaMEDMEM/InterpolationMatrix.cxx
index fe60b350de8a0d37c7ac4fe9a9639341b8eb51bb..2fbffef5318551f5791f7e4ee0fcdd8fdffc28db 100644 (file)
--- a/src/ParaMEDMEM/InterpolationMatrix.cxx
+++ b/src/ParaMEDMEM/InterpolationMatrix.cxx
@@ -19,7 +19,7 @@
 
 #include "DECOptions.hxx"
 #include "MCType.hxx"
-#include "MEDCouplingNormalizedUnstructuredMesh.hxx"
+#include "MEDCouplingNormalizedUnstructuredMesh.txx"
 #include "Interpolation2D.hxx"
 #include "Interpolation3D.hxx"
 #include "Interpolation2D3D.hxx"

diff --git a/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx b/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx
index 4dcc59fb27fef3385ca2e73f22e4203eacad3119..d81d0c25a61d28c39e1cb553df62a2aa935c22ff 100644 (file)
--- a/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx
+++ b/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx
@@ -22,7 +22,7 @@
 #include "DECOptions.hxx"
 #include "OverlapElementLocator.hxx"
 #include "MCType.hxx"
-#include "MEDCouplingNormalizedUnstructuredMesh.hxx"
+#include "MEDCouplingNormalizedUnstructuredMesh.txx"
 #include "Interpolation2D.hxx"
 #include "Interpolation3D.hxx"
 #include "Interpolation2D3D.hxx"

diff --git a/src/ParaMEDMEM/ParaDataArray.txx b/src/ParaMEDMEM/ParaDataArray.txx
index 7e358d6cf2a9cc9dd885b3e934b07c272a8d5d6d..232c7c8acf3a99664edbc2a3c95791426b33d620 100644 (file)
--- a/src/ParaMEDMEM/ParaDataArray.txx
+++ b/src/ParaMEDMEM/ParaDataArray.txx
@@ -22,7 +22,7 @@
 
 #include "MEDCouplingTraits.hxx"
 #include "MCType.hxx"
-#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 #include "MCAuto.hxx"
 #include "ParaDataArray.hxx"
 #include "CommInterface.hxx"

diff --git a/src/ParaMEDMEM/ParaUMesh.cxx b/src/ParaMEDMEM/ParaUMesh.cxx
index f72e96b35c190435df13c766de108e67af719541..315d345b292dfcde382ef92708b813bbb99b5adf 100644 (file)
--- a/src/ParaMEDMEM/ParaUMesh.cxx
+++ b/src/ParaMEDMEM/ParaUMesh.cxx
@@ -27,7 +27,7 @@
 #include "MEDCouplingRefCountObject.hxx"
 #include "MPIProcessorGroup.hxx"
 #include "CommInterface.hxx"
-#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 
 #include "mpi.h"