Revert "refactor: include hxx instead of txx when explicitly declared"

This reverts commit 6e31243201782b899b039c233a3f32536d4650a0.

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/MEDCouplingTimeDiscretization.txx b/src/MEDCoupling/MEDCouplingTimeDiscretization.txx
index 907e3c4da2609f45832ed52f2680a4c68f7695bd..f48d9b77297bbc8415032f1f63d01e6276ec5c37 100644 (file)
--- a/src/MEDCoupling/MEDCouplingTimeDiscretization.txx
+++ b/src/MEDCoupling/MEDCouplingTimeDiscretization.txx
@@ -26,6 +26,7 @@
 #include "MEDCouplingTimeDiscretization.hxx"
 #include "MEDCouplingTraits.hxx"
 #include "InterpKernelException.hxx"
+#include "MEDCouplingMemArray.txx"
 
 #include <algorithm>
 #include <cmath>

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/MEDFileFieldMultiTS.cxx b/src/MEDLoader/MEDFileFieldMultiTS.cxx
index 397155121e220ea7ae367a76cbef7bc357630524..46dd6b1505167eee75251eae01031c562f1cc926 100644 (file)
--- a/src/MEDLoader/MEDFileFieldMultiTS.cxx
+++ b/src/MEDLoader/MEDFileFieldMultiTS.cxx
@@ -20,7 +20,6 @@
 
 #include "MEDFileFieldMultiTS.hxx"
 #include "MEDFileField.txx"
-#include "MEDFileMesh.hxx"
 #include "MCType.hxx"
 #include "MEDFileFieldGlobs.hxx"
 #include "MEDFileEntities.hxx"

diff --git a/src/MEDLoader/MEDFileMesh.cxx b/src/MEDLoader/MEDFileMesh.cxx
index 9a3caac27e9bc59a3f92af97cefe38f73846907c..72dea91d767ac95821e458fd7e043aabaee7de3a 100644 (file)
--- a/src/MEDLoader/MEDFileMesh.cxx
+++ b/src/MEDLoader/MEDFileMesh.cxx
@@ -47,6 +47,7 @@
 
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCouplingMappedExtrudedMesh.hxx"
+#include "MEDCouplingMemArray.txx"
 // #include "MEDFileMeshElt.hxx"
 
 #include "InterpKernelAutoPtr.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/ParaMEDMEM/ParaDataArray.cxx b/src/ParaMEDMEM/ParaDataArray.cxx
index bfee15a6c6c696d27f7e2a821f9331a2ebf102e6..7bd2249c0f079539ba5fb6cbb4197f12b51dcb97 100644 (file)
--- a/src/ParaMEDMEM/ParaDataArray.cxx
+++ b/src/ParaMEDMEM/ParaDataArray.cxx
@@ -21,11 +21,9 @@
 #include "ParaDataArray.txx"
 #include "MCType.hxx"
 #include "MEDCouplingMemArray.hxx"
-#include "MEDCouplingMemArray.txx"
 
 using namespace MEDCoupling;
 
-template class MEDCoupling::DataArrayTemplate<int>;
 template class MEDCoupling::ParaDataArrayTemplate<Int32>;
 template class MEDCoupling::ParaDataArrayTemplate<Int64>;
 template class MEDCoupling::ParaDataArrayDiscrete<Int32>;

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"