X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingTraits.hxx;h=d91e7cba4591893e2a0136856349c804d353e7c3;hb=0ba3453939dda0697b09ed7e728a01d4f33e3ce2;hp=fad3d7cf7106663bad8d40fbfe893bde66bdce62;hpb=1c9761aeac9192f62f324ad7a04430f2482bc843;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/MEDCouplingTraits.hxx b/src/MEDCoupling/MEDCouplingTraits.hxx index fad3d7cf7..d91e7cba4 100644 --- a/src/MEDCoupling/MEDCouplingTraits.hxx +++ b/src/MEDCoupling/MEDCouplingTraits.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2020 CEA/DEN, EDF R&D +// Copyright (C) 2016-2023 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -18,8 +18,7 @@ // // Author : Anthony Geay (EDF R&D) -#ifndef __MEDCOUPLINGTRAITS_HXX__ -#define __MEDCOUPLINGTRAITS_HXX__ +#pragma once #include "MEDCoupling.hxx" #include "MCType.hxx" @@ -30,7 +29,7 @@ namespace MEDCoupling template struct MEDCOUPLING_EXPORT Traits { - typedef T EltType; + using EltType = T; }; class DataArrayInt32; @@ -41,7 +40,8 @@ namespace MEDCoupling class DataArrayInt64; class MEDCouplingFieldDouble; class MEDCouplingFieldFloat; - class MEDCouplingFieldInt; + class MEDCouplingFieldInt32; + class MEDCouplingFieldInt64; class DataArrayInt32Tuple; class DataArrayInt64Tuple; class DataArrayFloatTuple; @@ -87,7 +87,7 @@ namespace MEDCoupling static const char VTKReprStr[]; using ArrayType = DataArrayInt32; using ArrayTypeCh = DataArrayInt32; - using FieldType = MEDCouplingFieldInt; + using FieldType = MEDCouplingFieldInt32; using ArrayTuple = DataArrayInt32Tuple; using IteratorType = DataArrayInt32Iterator; }; @@ -102,7 +102,7 @@ namespace MEDCoupling static const char VTKReprStr[]; using ArrayType = DataArrayInt64; using ArrayTypeCh = DataArrayInt64; - //using FieldType = MEDCouplingFieldInt64; + using FieldType = MEDCouplingFieldInt64; using ArrayTuple = DataArrayInt64Tuple; using IteratorType = DataArrayInt64Iterator; }; @@ -117,5 +117,3 @@ namespace MEDCoupling using IteratorType = DataArrayByteIterator; }; } - -#endif