Covariance: forgot the most important one deepCpy() !!

diff --git a/src/MEDCoupling/MEDCouplingMesh.hxx b/src/MEDCoupling/MEDCouplingMesh.hxx
index b748be9817e56fa22ce646f3b8c4cd3b73934927..817b8d0cdb201c742ec6ad7df52aa649b1d3111b 100644 (file)
--- a/src/MEDCoupling/MEDCouplingMesh.hxx
+++ b/src/MEDCoupling/MEDCouplingMesh.hxx
@@ -64,10 +64,11 @@ namespace ParaMEDMEM
     MEDCOUPLING_EXPORT void setTime(double val, int iteration, int order) { _time=val; _iteration=iteration; _order=order; }
     MEDCOUPLING_EXPORT void setTimeUnit(const std::string& unit) { _time_unit=unit; }
     MEDCOUPLING_EXPORT std::string getTimeUnit() const { return _time_unit; }
-    MEDCOUPLING_EXPORT virtual MEDCouplingMesh *deepCpy() const = 0;
-    MEDCOUPLING_EXPORT virtual MEDCouplingMesh *clone(bool recDeepCpy) const = 0;
     MEDCOUPLING_EXPORT virtual MEDCouplingMeshType getType() const = 0;
     MEDCOUPLING_EXPORT bool isStructured() const;
+    // Copy methods
+    MEDCOUPLING_EXPORT virtual MEDCouplingMesh *deepCpy() const = 0;
+    MEDCOUPLING_EXPORT virtual MEDCouplingMesh *clone(bool recDeepCpy) const = 0;
     MEDCOUPLING_EXPORT virtual void copyTinyStringsFrom(const MEDCouplingMesh *other);
     MEDCOUPLING_EXPORT virtual void copyTinyInfoFrom(const MEDCouplingMesh *other);
     // comparison methods

diff --git a/src/MEDCoupling/MEDCouplingUMesh.cxx b/src/MEDCoupling/MEDCouplingUMesh.cxx
index 7a0926ef3a273ab524523998afe1397008c60429..a9c55c69725c1bc0f1cb7c6140a7d1d0c20144c7 100644 (file)
--- a/src/MEDCoupling/MEDCouplingUMesh.cxx
+++ b/src/MEDCoupling/MEDCouplingUMesh.cxx
@@ -71,21 +71,22 @@ MEDCouplingUMesh *MEDCouplingUMesh::New(const std::string& meshName, int meshDim
 }
 
 /*!
- * Returns a new MEDCouplingMesh which is a full copy of \a this one. No data is shared
+ * Returns a new MEDCouplingUMesh which is a full copy of \a this one. No data is shared
  * between \a this and the new mesh.
- *  \return MEDCouplingMesh * - a new instance of MEDCouplingMesh. The caller is to
+ *  \return MEDCouplingUMesh * - a new instance of MEDCouplingMesh. The caller is to
  *          delete this mesh using decrRef() as it is no more needed. 
  */
-MEDCouplingMesh *MEDCouplingUMesh::deepCpy() const
+MEDCouplingUMesh *MEDCouplingUMesh::deepCpy() const
 {
   return clone(true);
 }
 
+
 /*!
- * Returns a new MEDCouplingMesh which is a copy of \a this one.
+ * Returns a new MEDCouplingUMesh which is a copy of \a this one.
  *  \param [in] recDeepCpy - if \a true, the copy is deep, else all data arrays of \a
  * this mesh are shared by the new mesh.
- *  \return MEDCouplingMesh * - a new instance of MEDCouplingMesh. The caller is to
+ *  \return MEDCouplingUMesh * - a new instance of MEDCouplingMesh. The caller is to
  *          delete this mesh using decrRef() as it is no more needed. 
  */
 MEDCouplingUMesh *MEDCouplingUMesh::clone(bool recDeepCpy) const

diff --git a/src/MEDCoupling/MEDCouplingUMesh.hxx b/src/MEDCoupling/MEDCouplingUMesh.hxx
index 4a06f26f38df88142655b7a260e64c69c125c67e..5e81aff3ac13ca20090beb2dceb337ea5099dcdb 100644 (file)
--- a/src/MEDCoupling/MEDCouplingUMesh.hxx
+++ b/src/MEDCoupling/MEDCouplingUMesh.hxx
@@ -42,9 +42,11 @@ namespace ParaMEDMEM
   public:
     MEDCOUPLING_EXPORT static MEDCouplingUMesh *New();
     MEDCOUPLING_EXPORT static MEDCouplingUMesh *New(const std::string& meshName, int meshDim);
-    MEDCOUPLING_EXPORT MEDCouplingMesh *deepCpy() const;
+    // Copy methods
+    MEDCOUPLING_EXPORT MEDCouplingUMesh *deepCpy() const;;
     MEDCOUPLING_EXPORT MEDCouplingUMesh *clone(bool recDeepCpy) const;
     MEDCOUPLING_EXPORT MEDCouplingUMesh *deepCpyConnectivityOnly() const;
+
     MEDCOUPLING_EXPORT void shallowCopyConnectivityFrom(const MEDCouplingPointSet *other);
     MEDCOUPLING_EXPORT void updateTime() const;
     MEDCOUPLING_EXPORT std::size_t getHeapMemorySizeWithoutChildren() const;

diff --git a/v8_work/TODO.txt b/v8_work/TODO.txt
index b7cc5c0c06637b65573dfd5c8f403a21231a12d9..f2adaa4fd543e11a21ffb540f23d12a2477fb518 100644 (file)
--- a/v8_work/TODO.txt
+++ b/v8_work/TODO.txt
@@ -4,6 +4,7 @@ TODO for V8
 Covariance fixes [DONE]
 ================
     + MEDCouplingUMesh
+        deepCpy !
         deepCpyConnectivityOnly
         mergeMyselfWithOnSameCoords
         buildPartOfMySelf
@@ -53,6 +54,7 @@ Interpolation
 All classes
 -----------
     deepCpy / deepCopy
+    performCpy / performCopyOrIncrRef
 
 Auto-pointeur
 -------------
@@ -75,6 +77,7 @@ MEDCouplingPointSet
     renumberNodes2 / renumberNodesCenter
     buildPartOfMySelf2 / buildPartOfMySelfSlice
     buildPartOfMySelfKeepCoords2 / buildPartOfMySelfKeepCoordsSlice
+    deepCpyConnectivityOnly / deepCopyConnectivityOnly
     
 MEDCoupling1DGTUMesh
 --------------------
@@ -93,6 +96,7 @@ MEDCouplingUMesh
     ExtractFromIndexedArrays2 / ExtractFromIndexedArraysSlice
     SetPartOfIndexedArrays2 / SetPartOfIndexedArraysSlice
     SetPartOfIndexedArraysSameIdx2 / SetPartOfIndexedArraysSameIdxSlice
+    deepCpyConnectivityOnly / deepCopyConnectivityOnly
 
 DataArray
 ---------