fix conflict

[modules/med.git] / medtool / src / MEDCoupling / MEDCouplingMemArray.hxx

diff --git a/medtool/src/MEDCoupling/MEDCouplingMemArray.hxx b/medtool/src/MEDCoupling/MEDCouplingMemArray.hxx
index 1fc39204c7441939393795170fdd4ecdf662ed35..201b7601e96abd7bb6cdf57550b3474fe465a047 100644 (file)
--- a/medtool/src/MEDCoupling/MEDCouplingMemArray.hxx
+++ b/medtool/src/MEDCoupling/MEDCouplingMemArray.hxx
@@ -253,6 +253,7 @@ namespace ParaMEDMEM
     MEDCOUPLING_EXPORT DataArrayDouble *renumberR(const int *new2Old) const;
     MEDCOUPLING_EXPORT DataArrayDouble *renumberAndReduce(const int *old2New, int newNbOfTuple) const;
     MEDCOUPLING_EXPORT DataArrayDouble *selectByTupleId(const int *new2OldBg, const int *new2OldEnd) const;
+    MEDCOUPLING_EXPORT DataArrayDouble *selectByTupleId(const DataArrayInt & di) const;
     MEDCOUPLING_EXPORT DataArrayDouble *selectByTupleIdSafe(const int *new2OldBg, const int *new2OldEnd) const;
     MEDCOUPLING_EXPORT DataArrayDouble *selectByTupleId2(int bg, int end2, int step) const;
     MEDCOUPLING_EXPORT DataArray *selectByTupleRanges(const std::vector<std::pair<int,int> >& ranges) const;