Ready for integration

diff --git a/src/MEDCoupling/MEDCouplingMemArray.txx b/src/MEDCoupling/MEDCouplingMemArray.txx
index 47e6961fa9bb947165c7b85caedfa11a6867c88e..c8ea9370feb552fcfcbc10027a9b809971937820 100644 (file)
--- a/src/MEDCoupling/MEDCouplingMemArray.txx
+++ b/src/MEDCoupling/MEDCouplingMemArray.txx
@@ -601,7 +601,7 @@ namespace MEDCoupling
   {
     std::size_t sz(_mem.getNbOfElemAllocated());
     sz*=sizeof(T);
-    return this->getHeapMemorySizeWithoutChildren()+sz;
+    return DataArray::getHeapMemorySizeWithoutChildren()+sz;
   }
   
   /*!
@@ -3351,7 +3351,7 @@ struct NotInRange
   template<class T>
   void DataArrayTemplateClassic<T>::reprWithoutNameStream(std::ostream& stream) const
   {
-    this->reprWithoutNameStream(stream);
+    DataArray::reprWithoutNameStream(stream);
     ImplReprTraits<T>::SetPrecision(stream);
     this->_mem.repr(this->getNumberOfComponents(),stream);
   }
@@ -3359,7 +3359,7 @@ struct NotInRange
   template<class T>
   void DataArrayTemplateClassic<T>::reprZipWithoutNameStream(std::ostream& stream) const
   {
-    this->reprWithoutNameStream(stream);
+    DataArray::reprWithoutNameStream(stream);
     ImplReprTraits<T>::SetPrecision(stream);
     this->_mem.reprZip(this->getNumberOfComponents(),stream);
   }
@@ -3367,7 +3367,7 @@ struct NotInRange
   template<class T>
   void DataArrayTemplateClassic<T>::reprNotTooLongWithoutNameStream(std::ostream& stream) const
   {
-    this->reprWithoutNameStream(stream);
+    DataArray::reprWithoutNameStream(stream);
     ImplReprTraits<T>::SetPrecision(stream);
     this->_mem.reprNotTooLong(this->getNumberOfComponents(),stream);
   }
@@ -3469,7 +3469,7 @@ struct NotInRange
   template<class T>
   typename Traits<T>::ArrayType *DataArrayDiscrete<T>::New()
   {
-    return nullptr;//new typename Traits<T>::ArrayType;
+    return new typename Traits<T>::ArrayType;
   }
   
   /*!