From 66031753d0d3630aa67fa454b3b999fe5a90e355 Mon Sep 17 00:00:00 2001 From: SONOLET Aymeric Date: Mon, 13 May 2024 16:06:39 +0200 Subject: [PATCH] feat: do not include .txx when templates are explicitly instanciated --- 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 | 6 +++--- src/ParaMEDMEM/ParaDataArray.cxx | 3 ++- src/ParaMEDMEM/ParaDataArray.txx | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/MEDCoupling/MEDCouplingIMesh.cxx b/src/MEDCoupling/MEDCouplingIMesh.cxx index 749124e81..0786ca0c7 100644 --- a/src/MEDCoupling/MEDCouplingIMesh.cxx +++ b/src/MEDCoupling/MEDCouplingIMesh.cxx @@ -37,7 +37,7 @@ #include "MCType.hxx" #include "MEDCouplingCMesh.hxx" #include "MEDCouplingFieldDouble.hxx" -#include "MEDCouplingMemArray.txx" +#include "MEDCouplingMemArray.hxx" #include "MEDCouplingMesh.hxx" #include "MEDCouplingRefCountObject.hxx" #include "MEDCouplingStructuredMesh.hxx" diff --git a/src/MEDCoupling/MEDCouplingTimeDiscretization.txx b/src/MEDCoupling/MEDCouplingTimeDiscretization.txx index a69beecb5..67358eaab 100644 --- a/src/MEDCoupling/MEDCouplingTimeDiscretization.txx +++ b/src/MEDCoupling/MEDCouplingTimeDiscretization.txx @@ -31,7 +31,6 @@ #include "InterpKernelException.hxx" #include "MCType.hxx" -#include "MEDCouplingMemArray.txx" #include "MEDCouplingRefCountObject.hxx" #include "MEDCouplingTimeDiscretization.hxx" #include "MEDCouplingTraits.hxx" diff --git a/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx b/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx index 71fae0692..1a079a9a4 100644 --- a/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx +++ b/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx @@ -25,7 +25,7 @@ #include #include "MCType.hxx" -#include "MEDCouplingMemArray.txx" +#include "MEDCouplingMemArray.hxx" #ifdef WITH_NUMPY #include diff --git a/src/MEDLoader/MEDFileFieldMultiTS.cxx b/src/MEDLoader/MEDFileFieldMultiTS.cxx index 1a765f704..ee8fcd96f 100644 --- a/src/MEDLoader/MEDFileFieldMultiTS.cxx +++ b/src/MEDLoader/MEDFileFieldMultiTS.cxx @@ -50,6 +50,7 @@ #include "MEDFileFieldGlobs.hxx" #include "MEDFileFieldOverView.hxx" #include "MEDFileFieldVisitor.hxx" +#include "MEDFileMesh.hxx" #include "MEDFileSafeCaller.txx" #include "MEDFileUtilities.hxx" #include "MEDLoaderBase.hxx" diff --git a/src/MEDLoader/MEDFileMesh.cxx b/src/MEDLoader/MEDFileMesh.cxx index ac8d89444..b40bebe0a 100644 --- a/src/MEDLoader/MEDFileMesh.cxx +++ b/src/MEDLoader/MEDFileMesh.cxx @@ -29,7 +29,6 @@ #include "MEDCouplingCurveLinearMesh.hxx" #include "MEDCouplingMappedExtrudedMesh.hxx" #include "MEDCouplingMemArray.hxx" -#include "MEDCouplingMemArray.txx" #include "MEDCouplingMesh.hxx" #include "MEDCouplingPartDefinition.hxx" #include "MEDCouplingPointSet.hxx" diff --git a/src/MEDLoader/MEDFileMeshLL.cxx b/src/MEDLoader/MEDFileMeshLL.cxx index f90cd2f7c..fea980610 100644 --- a/src/MEDLoader/MEDFileMeshLL.cxx +++ b/src/MEDLoader/MEDFileMeshLL.cxx @@ -41,8 +41,8 @@ #include "MCType.hxx" #include "MEDCoupling1GTUMesh.hxx" #include "MEDCouplingCurveLinearMesh.hxx" -#include "MEDCouplingMap.txx" -#include "MEDCouplingMemArray.txx" +#include "MEDCouplingMap.hxx" +#include "MEDCouplingMemArray.hxx" #include "MEDCouplingMesh.hxx" #include "MEDCouplingPartDefinition.hxx" #include "MEDCouplingRefCountObject.hxx" @@ -2366,7 +2366,7 @@ MEDFileUMeshAggregateCompute::getUmesh() const _m = MEDCoupling1GTUMesh::AggregateOnSameCoordsToUMesh(mp); _m_parts.clear(); // to avoid memory peak ! _m_time = _mp_time + 1; //+1 is important ! That is to say that only _m is - //OK not _m_parts because cleared ! + // OK not _m_parts because cleared ! return _m; } diff --git a/src/ParaMEDMEM/ParaDataArray.cxx b/src/ParaMEDMEM/ParaDataArray.cxx index 24571f18d..8c447b4fa 100644 --- a/src/ParaMEDMEM/ParaDataArray.cxx +++ b/src/ParaMEDMEM/ParaDataArray.cxx @@ -22,10 +22,11 @@ #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 9a8cdfbf5..acb9889b9 100644 --- a/src/ParaMEDMEM/ParaDataArray.txx +++ b/src/ParaMEDMEM/ParaDataArray.txx @@ -29,7 +29,7 @@ #include "CommInterface.hxx" #include "MCAuto.hxx" #include "MCType.hxx" -#include "MEDCouplingMemArray.txx" +#include "MEDCouplingMemArray.hxx" #include "MEDCouplingTraits.hxx" #include "ParaDataArray.hxx" -- 2.39.2