From 8dcf5ff26c55779df52d631c28f8c7a00971a318 Mon Sep 17 00:00:00 2001 From: SONOLET Aymeric Date: Thu, 12 Sep 2024 21:26:33 +0200 Subject: [PATCH] Revert "refactor: include hxx instead of txx when explicitly declared" This reverts commit 6e31243201782b899b039c233a3f32536d4650a0. --- src/MEDCoupling/MEDCouplingIMesh.cxx | 2 +- src/MEDCoupling/MEDCouplingTimeDiscretization.txx | 1 + src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx | 2 +- src/MEDLoader/MEDFileFieldMultiTS.cxx | 1 - src/MEDLoader/MEDFileMesh.cxx | 1 + src/MEDLoader/MEDFileMeshLL.cxx | 4 ++-- src/ParaMEDMEM/ParaDataArray.cxx | 2 -- src/ParaMEDMEM/ParaDataArray.txx | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/MEDCoupling/MEDCouplingIMesh.cxx b/src/MEDCoupling/MEDCouplingIMesh.cxx index cd781a447..7e4462c02 100644 --- 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 907e3c4da..f48d9b772 100644 --- 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 #include diff --git a/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx b/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx index 5db25568d..2a9179639 100644 --- 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 diff --git a/src/MEDLoader/MEDFileFieldMultiTS.cxx b/src/MEDLoader/MEDFileFieldMultiTS.cxx index 397155121..46dd6b150 100644 --- 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 9a3caac27..72dea91d7 100644 --- 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 cce318be9..f2341131f 100644 --- 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 bfee15a6c..7bd2249c0 100644 --- 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; template class MEDCoupling::ParaDataArrayTemplate; template class MEDCoupling::ParaDataArrayTemplate; template class MEDCoupling::ParaDataArrayDiscrete; diff --git a/src/ParaMEDMEM/ParaDataArray.txx b/src/ParaMEDMEM/ParaDataArray.txx index 7e358d6cf..232c7c8ac 100644 --- 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" -- 2.39.2