X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FMEDLoaderTraits.hxx;h=336517e73377c415264f8d4a2cfb0a7a5746167d;hb=f2ab61e92f55ee52cf5196f7904f625d93c8c2d0;hp=631bf325c65d139f3b26d42d29280427d5ecfd7f;hpb=9727e779d56acece98be02cdccd0f99cc5ef0fa2;p=tools%2Fmedcoupling.git diff --git a/src/MEDLoader/MEDLoaderTraits.hxx b/src/MEDLoader/MEDLoaderTraits.hxx index 631bf325c..336517e73 100644 --- a/src/MEDLoader/MEDLoaderTraits.hxx +++ b/src/MEDLoader/MEDLoaderTraits.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2019 CEA/DEN, EDF R&D +// Copyright (C) 2016-2020 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -18,10 +18,10 @@ // // Author : Anthony Geay (EDF R&D) -#ifndef __MEDLOADERTRAITS_HXX__ -#define __MEDLOADERTRAITS_HXX__ +#pragma once #include "MEDLoaderDefines.hxx" +#include "MCType.hxx" namespace MEDCoupling { @@ -33,15 +33,19 @@ namespace MEDCoupling class MEDFileFieldMultiTS; class MEDFileField1TS; - class MEDFileIntFieldMultiTS; - class MEDFileIntField1TS; + class MEDFileInt32FieldMultiTS; + class MEDFileInt64FieldMultiTS; + class MEDFileInt32Field1TS; + class MEDFileInt64Field1TS; class MEDFileFloatFieldMultiTS; class MEDFileFloatField1TS; class MEDFileField1TSWithoutSDA; - class MEDFileIntField1TSWithoutSDA; + class MEDFileInt32Field1TSWithoutSDA; + class MEDFileInt64Field1TSWithoutSDA; class MEDFileFloatField1TSWithoutSDA; class MEDFileFieldMultiTSWithoutSDA; - class MEDFileIntFieldMultiTSWithoutSDA; + class MEDFileInt32FieldMultiTSWithoutSDA; + class MEDFileInt64FieldMultiTSWithoutSDA; class MEDFileFloatFieldMultiTSWithoutSDA; template<> @@ -63,12 +67,21 @@ namespace MEDCoupling }; template<> - struct MEDLOADER_EXPORT MLFieldTraits + struct MEDLOADER_EXPORT MLFieldTraits { - typedef MEDFileIntFieldMultiTSWithoutSDA FMTSWSDAType; - typedef MEDFileIntFieldMultiTS FMTSType; - typedef MEDFileIntField1TS F1TSType; - typedef MEDFileIntField1TSWithoutSDA F1TSWSDAType; + typedef MEDFileInt32FieldMultiTSWithoutSDA FMTSWSDAType; + typedef MEDFileInt32FieldMultiTS FMTSType; + typedef MEDFileInt32Field1TS F1TSType; + typedef MEDFileInt32Field1TSWithoutSDA F1TSWSDAType; + }; + + template<> + struct MEDLOADER_EXPORT MLFieldTraits + { + typedef MEDFileInt64FieldMultiTSWithoutSDA FMTSWSDAType; + typedef MEDFileInt64FieldMultiTS FMTSType; + typedef MEDFileInt64Field1TS F1TSType; + typedef MEDFileInt64Field1TSWithoutSDA F1TSWSDAType; }; template @@ -98,5 +111,3 @@ namespace MEDCoupling static const char ClassName[]; }; } - -#endif