X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingTraits.hxx;h=a14232eec8114310127d62b50cd2ca85f21d485f;hb=ac1df6b0ba8b337555fb39610c89f678d889580d;hp=11e62f87d154c3c720792335de1eaa46affad273;hpb=7993ad46aa1b33253c97499712bc21e4c41c506c;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/MEDCouplingTraits.hxx b/src/MEDCoupling/MEDCouplingTraits.hxx index 11e62f87d..a14232eec 100644 --- a/src/MEDCoupling/MEDCouplingTraits.hxx +++ b/src/MEDCoupling/MEDCouplingTraits.hxx @@ -22,6 +22,7 @@ #define __MEDCOUPLINGTRAITS_HXX__ #include "MEDCoupling.hxx" +#include "MCType.hxx" namespace MEDCoupling { @@ -31,15 +32,16 @@ namespace MEDCoupling typedef T EltType; }; - class DataArrayInt; + class DataArrayInt32; class DataArrayFloat; class DataArrayDouble; class DataArrayChar; class DataArrayByte; + class DataArrayInt64; class MEDCouplingFieldDouble; class MEDCouplingFieldFloat; class MEDCouplingFieldInt; - class DataArrayIntTuple; + class DataArrayInt32Tuple; class DataArrayFloatTuple; class DataArrayDoubleTuple; @@ -49,6 +51,7 @@ namespace MEDCoupling static const char ArrayTypeName[]; static const char FieldTypeName[]; static const char NPYStr[]; + static const char ReprStr[]; typedef DataArrayDouble ArrayType; typedef DataArrayDouble ArrayTypeCh; typedef MEDCouplingFieldDouble FieldType; @@ -61,6 +64,7 @@ namespace MEDCoupling static const char ArrayTypeName[]; static const char FieldTypeName[]; static const char NPYStr[]; + static const char ReprStr[]; typedef DataArrayFloat ArrayType; typedef DataArrayFloat ArrayTypeCh; typedef MEDCouplingFieldFloat FieldType; @@ -68,14 +72,29 @@ namespace MEDCoupling }; template<> - struct MEDCOUPLING_EXPORT Traits + struct MEDCOUPLING_EXPORT Traits { static const char ArrayTypeName[]; static const char FieldTypeName[]; - typedef DataArrayInt ArrayType; - typedef DataArrayInt ArrayTypeCh; + static const char NPYStr[]; + static const char ReprStr[]; + typedef DataArrayInt32 ArrayType; + typedef DataArrayInt32 ArrayTypeCh; typedef MEDCouplingFieldInt FieldType; - typedef DataArrayIntTuple ArrayTuple; + typedef DataArrayInt32Tuple ArrayTuple; + }; + + template<> + struct MEDCOUPLING_EXPORT Traits + { + static const char ArrayTypeName[]; + static const char FieldTypeName[]; + static const char NPYStr[]; + static const char ReprStr[]; + typedef DataArrayInt64 ArrayType; + typedef DataArrayInt64 ArrayTypeCh; + //typedef MEDCouplingFieldInt64 FieldType; + //typedef DataArrayInt64Tuple ArrayTuple; }; template<>