Mark the duplicating methods to easily identify them for removal after SWIG update.

diff --git a/src/MEDCoupling/MEDCouplingFieldDouble.cxx b/src/MEDCoupling/MEDCouplingFieldDouble.cxx
index ae95a963625ed4b2e9824d3282d79816fe4bdd25..0636f054a4d85f135d61e66458e264fc930d6bbc 100755 (executable)
--- a/src/MEDCoupling/MEDCouplingFieldDouble.cxx
+++ b/src/MEDCoupling/MEDCouplingFieldDouble.cxx
@@ -2314,8 +2314,9 @@ MEDCouplingFieldDouble *MEDCouplingFieldDouble::keepSelectedComponents(const std
 }
 MEDCouplingFieldDouble *MEDCouplingFieldDouble::keepSelectedComponents(const std::vector<mcIdType>& compoIds) const
 {
+  // The method has to be removed as duplicate after SWIG update
   std::vector<std::size_t> ids (compoIds.size());
-  std::copy(compoIds.begin(), compoIds.end(), ids.begin());
+  cast_to_remove (compoIds, ids);
   return keepSelectedComponents(ids);
 }
 
@@ -2337,6 +2338,7 @@ void MEDCouplingFieldDouble::setSelectedComponents(const MEDCouplingFieldDouble
 }
 void MEDCouplingFieldDouble::setSelectedComponents(const MEDCouplingFieldDouble *f, const std::vector<mcIdType>& compoIds)
 {
+  // The method has to be removed as duplicate after SWIG update
   timeDiscr()->setSelectedComponents(f->timeDiscr(),compoIds);
 }
 

diff --git a/src/MEDCoupling/MEDCouplingMemArray.cxx b/src/MEDCoupling/MEDCouplingMemArray.cxx
index dd84f89fbce27a39189cc36daed9ebf040f49a6c..81a59de1b7a68a701b5104f4fe7f510d6333b76c 100755 (executable)
--- a/src/MEDCoupling/MEDCouplingMemArray.cxx
+++ b/src/MEDCoupling/MEDCouplingMemArray.cxx
@@ -193,8 +193,9 @@ void DataArray::copyStringInfoFrom(const DataArray& other)
 
 void DataArray::copyPartOfStringInfoFrom(const DataArray& other, const std::vector<mcIdType>& compoIds)
 {
+  // The method has to be removed as duplicate after SWIG update
   std::vector<std::size_t> ids (compoIds.size());
-  std::copy(compoIds.begin(), compoIds.end(), ids.begin());
+  cast_to_remove(compoIds, ids);
   copyPartOfStringInfoFrom(other, ids);
 }
 
@@ -214,8 +215,9 @@ void DataArray::copyPartOfStringInfoFrom(const DataArray& other, const std::vect
 
 void DataArray::copyPartOfStringInfoFrom2(const std::vector<mcIdType>& compoIds, const DataArray& other)
 {
+  // The method has to be removed as duplicate after SWIG update
   std::vector<std::size_t> ids (compoIds.size());
-  std::copy(compoIds.begin(), compoIds.end(), ids.begin());
+  cast_to_remove (compoIds, ids);
   copyPartOfStringInfoFrom2(ids, other);
 }
 
@@ -1361,8 +1363,9 @@ void DataArrayDouble::setSelectedComponents(const DataArrayDouble *a, const std:
 }
 void DataArrayDouble::setSelectedComponents(const DataArrayDouble *a, const std::vector<mcIdType>& compoIds)
 {
+  // The method has to be removed as duplicate after SWIG update
   std::vector<std::size_t> ids (compoIds.size());
-  std::copy(compoIds.begin(), compoIds.end(), ids.begin());
+  cast_to_remove(compoIds, ids);
   setSelectedComponents (a, ids);
 }
 /*!

diff --git a/src/MEDCoupling/MEDCouplingMemArray.txx b/src/MEDCoupling/MEDCouplingMemArray.txx
index 5d3ee2f72883fcee610154f2010172c923f7ac35..9f553fb82c8252173374fce53162adac8dd81c1f 100755 (executable)
--- a/src/MEDCoupling/MEDCouplingMemArray.txx
+++ b/src/MEDCoupling/MEDCouplingMemArray.txx
@@ -1355,8 +1355,9 @@ namespace MEDCoupling
   template<class T>
   typename Traits<T>::ArrayType *DataArrayTemplate<T>::myKeepSelectedComponents(const std::vector<mcIdType>& compoIds) const
   {
+    // The method has to be removed as duplicate after SWIG update
     std::vector<std::size_t> ids (compoIds.size());
-    std::copy(compoIds.begin(), compoIds.end(), ids.begin());
+    cast_to_remove(compoIds, ids);
     return myKeepSelectedComponents (ids);
   }
   /*!
@@ -4749,8 +4750,9 @@ struct NotInRange
   template <class T>
   void DataArrayDiscrete<T>::setSelectedComponents(const DataArrayType *a, const std::vector<mcIdType>& compoIds)
   {
+    // The method has to be removed as duplicate after SWIG update
     std::vector<std::size_t> ids (compoIds.size());
-    std::copy(compoIds.begin(), compoIds.end(), ids.begin());
+    cast_to_remove(compoIds, ids);
     setSelectedComponents (a, ids);
   }
 

diff --git a/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx b/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
index 86c7e27bd8f838de5892f8fd671bb1e0f65336d6..9dd25fa7fc2881a721fca8037da9aba2ef0e447d 100644 (file)
--- a/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
+++ b/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
@@ -363,8 +363,9 @@ MEDCouplingTimeDiscretization *MEDCouplingTimeDiscretization::keepSelectedCompon
 }
 MEDCouplingTimeDiscretization *MEDCouplingTimeDiscretization::keepSelectedComponents(const std::vector<mcIdType>& compoIds) const
 {
+  // The method has to be removed as duplicate after SWIG update
   std::vector<std::size_t> ids (compoIds.size());
-  std::copy(compoIds.begin(), compoIds.end(), ids.begin());
+  cast_to_remove(compoIds, ids);
   return keepSelectedComponents(ids);
 }
 
@@ -385,8 +386,9 @@ void MEDCouplingTimeDiscretization::setSelectedComponents(const MEDCouplingTimeD
 }
 void MEDCouplingTimeDiscretization::setSelectedComponents(const MEDCouplingTimeDiscretization *other, const std::vector<mcIdType>& compoIds)
 {
+  // The method has to be removed as duplicate after SWIG update
   std::vector<std::size_t> ids (compoIds.size());
-  std::copy(compoIds.begin(), compoIds.end(), ids.begin());
+  cast_to_remove (compoIds, ids);
   setSelectedComponents (other, ids);
 }
 

diff --git a/src/MEDCoupling/MEDCouplingTraits.hxx b/src/MEDCoupling/MEDCouplingTraits.hxx
index 5d550b55e84ef925715db6ae6625b22bab2e7d81..1976a38cf32a0151652055bd7359e1f1148be659 100644 (file)
--- a/src/MEDCoupling/MEDCouplingTraits.hxx
+++ b/src/MEDCoupling/MEDCouplingTraits.hxx
@@ -23,9 +23,16 @@
 
 #include "MEDCoupling.hxx"
 #include "MCType.hxx"
+#include <vector>
 
 namespace MEDCoupling
 {
+  inline void cast_to_remove (const std::vector<mcIdType>& in, std::vector<std::size_t>& out)
+  {
+    out.resize (in.size());
+    std::copy (in.begin(), in.end(), out.begin());
+  }
+
   template<class T>
   struct MEDCOUPLING_EXPORT Traits
   {