-// Copyright (C) 2016-2020 CEA/DEN, EDF R&D
+// Copyright (C) 2016-2024 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// Author : Anthony Geay (EDF R&D)
-#ifndef __MEDCOUPLINGTRAITS_HXX__
-#define __MEDCOUPLINGTRAITS_HXX__
+#pragma once
#include "MEDCoupling.hxx"
#include "MCType.hxx"
template<class T>
struct MEDCOUPLING_EXPORT Traits
{
- typedef T EltType;
+ using EltType = T;
};
class DataArrayInt32;
class DataArrayInt64;
class MEDCouplingFieldDouble;
class MEDCouplingFieldFloat;
- class MEDCouplingFieldInt;
+ class MEDCouplingFieldInt32;
+ class MEDCouplingFieldInt64;
class DataArrayInt32Tuple;
class DataArrayInt64Tuple;
class DataArrayFloatTuple;
static const char FieldTypeName[];
static const char NPYStr[];
static const char ReprStr[];
- typedef DataArrayDouble ArrayType;
- typedef DataArrayDouble ArrayTypeCh;
- typedef MEDCouplingFieldDouble FieldType;
- typedef DataArrayDoubleTuple ArrayTuple;
+ using ArrayType = DataArrayDouble;
+ using ArrayTypeCh = DataArrayDouble;
+ using FieldType = MEDCouplingFieldDouble;
+ using ArrayTuple = DataArrayDoubleTuple;
};
template<>
static const char FieldTypeName[];
static const char NPYStr[];
static const char ReprStr[];
- typedef DataArrayFloat ArrayType;
- typedef DataArrayFloat ArrayTypeCh;
- typedef MEDCouplingFieldFloat FieldType;
- typedef DataArrayFloatTuple ArrayTuple;
+ using ArrayType = DataArrayFloat;
+ using ArrayTypeCh = DataArrayFloat;
+ using FieldType = MEDCouplingFieldFloat;
+ using ArrayTuple = DataArrayFloatTuple;
};
template<>
static const char NPYStr[];
static const char ReprStr[];
static const char VTKReprStr[];
- typedef DataArrayInt32 ArrayType;
- typedef DataArrayInt32 ArrayTypeCh;
- typedef MEDCouplingFieldInt FieldType;
- typedef DataArrayInt32Tuple ArrayTuple;
- typedef DataArrayInt32Iterator IteratorType;
+ using ArrayType = DataArrayInt32;
+ using ArrayTypeCh = DataArrayInt32;
+ using FieldType = MEDCouplingFieldInt32;
+ using ArrayTuple = DataArrayInt32Tuple;
+ using IteratorType = DataArrayInt32Iterator;
};
template<>
static const char NPYStr[];
static const char ReprStr[];
static const char VTKReprStr[];
- typedef DataArrayInt64 ArrayType;
- typedef DataArrayInt64 ArrayTypeCh;
- //typedef MEDCouplingFieldInt64 FieldType;
- typedef DataArrayInt64Tuple ArrayTuple;
- typedef DataArrayInt64Iterator IteratorType;
+ using ArrayType = DataArrayInt64;
+ using ArrayTypeCh = DataArrayInt64;
+ using FieldType = MEDCouplingFieldInt64;
+ using ArrayTuple = DataArrayInt64Tuple;
+ using IteratorType = DataArrayInt64Iterator;
};
template<>
struct MEDCOUPLING_EXPORT Traits<char>
{
static const char ArrayTypeName[];
- typedef DataArrayByte ArrayTypeCh;
- typedef DataArrayChar ArrayType;
- typedef DataArrayByteTuple ArrayTuple;
- typedef DataArrayByteIterator IteratorType;
+ using ArrayTypeCh = DataArrayByte;
+ using ArrayType = DataArrayChar;
+ using ArrayTuple = DataArrayByteTuple;
+ using IteratorType = DataArrayByteIterator;
};
}
-
-#endif