Fix merge errors post 8.3.0

[tools/medcoupling.git] / src / MEDCoupling / MEDCouplingTraits.cxx

diff --git a/src/MEDCoupling/MEDCouplingTraits.cxx b/src/MEDCoupling/MEDCouplingTraits.cxx
index 0a30d982d97defc1ffe18aa698a3f107e390031c..eaeeffa0ab3154c994c18ef4c621ccda93e03ee3 100644 (file)
--- a/src/MEDCoupling/MEDCouplingTraits.cxx
+++ b/src/MEDCoupling/MEDCouplingTraits.cxx
@@ -26,8 +26,22 @@ const char Traits<double>::ArrayTypeName[]="DataArrayDouble";
 
 const char Traits<double>::FieldTypeName[]="MEDCouplingFieldDouble";
 
+const char Traits<double>::NPYStr[]="FLOAT64";
+
+const char Traits<float>::ArrayTypeName[]="DataArrayFloat";
+
+const char Traits<float>::FieldTypeName[]="MEDCouplingFieldFloat";
+
+const char Traits<float>::NPYStr[]="FLOAT32";
+
 const char Traits<int>::ArrayTypeName[]="DataArrayInt";
 
 const char Traits<int>::FieldTypeName[]="MEDCouplingFieldInt";
 
 const char Traits<char>::ArrayTypeName[]="DataArrayChar";
+
+const char Traits<Int64>::ArrayTypeName[]="DataArrayInt64";
+
+const char Traits<Int64>::FieldTypeName[]="MEDCouplingFieldInt64";
+
+const char Traits<Int64>::NPYStr[]="INT64";