From: Anthony Geay <anthony.geay@edf.fr>
Date: Thu, 20 Dec 2018 12:56:39 +0000 (+0100)
Subject: Ready for integration
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fagy%2Fint64_0;p=tools%2Fmedcoupling.git

Ready for integration
---

diff --git a/src/MEDCoupling/MEDCouplingMemArray.txx b/src/MEDCoupling/MEDCouplingMemArray.txx
index 47e6961fa..c8ea9370f 100644
--- 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;
   }
   
   /*!