From 233e256eb1c8ebe08e921e8816aeb511b418348f Mon Sep 17 00:00:00 2001
From: Anthony Geay <anthony.geay@edf.fr>
Date: Fri, 1 Feb 2019 14:44:31 +0100
Subject: [PATCH] int64 : update attributes

---
 src/MEDCoupling/MEDCoupling1GTUMesh.hxx            | 6 +++---
 src/MEDCoupling/MEDCouplingFieldDiscretization.hxx | 2 +-
 src/MEDCoupling/MEDCouplingIMesh.hxx               | 2 +-
 src/MEDCoupling/MEDCouplingMappedExtrudedMesh.hxx  | 4 ++--
 src/MEDCoupling/MEDCouplingPartDefinition.hxx      | 8 ++++----
 src/MEDCoupling/MEDCouplingRemapper.hxx            | 7 ++++---
 src/MEDCoupling/MEDCouplingSkyLineArray.hxx        | 6 +++---
 7 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/MEDCoupling/MEDCoupling1GTUMesh.hxx b/src/MEDCoupling/MEDCoupling1GTUMesh.hxx
index e8ae6a50a..b96ba877f 100644
--- a/src/MEDCoupling/MEDCoupling1GTUMesh.hxx
+++ b/src/MEDCoupling/MEDCoupling1GTUMesh.hxx
@@ -180,7 +180,7 @@ namespace MEDCoupling
     template<class MAPCLS>
     void renumberNodesInConnT(const MAPCLS& newNodeNumbersO2N);
   private:
-    MCAuto<DataArrayInt> _conn;
+    MCAuto<DataArrayIdType> _conn;
   public:
     static const int HEXA8_FACE_PAIRS[6];
   };
@@ -274,8 +274,8 @@ namespace MEDCoupling
     template<class MAPCLS>
     void renumberNodesInConnT(const MAPCLS& newNodeNumbersO2N);
   private:
-    MCAuto<DataArrayInt> _conn_indx;
-    MCAuto<DataArrayInt> _conn;
+    MCAuto<DataArrayIdType> _conn_indx;
+    MCAuto<DataArrayIdType> _conn;
   };
 }
 
diff --git a/src/MEDCoupling/MEDCouplingFieldDiscretization.hxx b/src/MEDCoupling/MEDCouplingFieldDiscretization.hxx
index ece607e77..f773b7cc6 100644
--- a/src/MEDCoupling/MEDCouplingFieldDiscretization.hxx
+++ b/src/MEDCoupling/MEDCouplingFieldDiscretization.hxx
@@ -226,7 +226,7 @@ namespace MEDCoupling
   protected:
     void buildDiscrPerCellIfNecessary(const MEDCouplingMesh *mesh);
   protected:
-    DataArrayInt *_discr_per_cell;
+    DataArrayIdType *_discr_per_cell;
     static const int DFT_INVALID_LOCID_VALUE;
   };
 
diff --git a/src/MEDCoupling/MEDCouplingIMesh.hxx b/src/MEDCoupling/MEDCouplingIMesh.hxx
index 362cb9803..9bc6bea40 100644
--- a/src/MEDCoupling/MEDCouplingIMesh.hxx
+++ b/src/MEDCoupling/MEDCouplingIMesh.hxx
@@ -118,7 +118,7 @@ namespace MEDCoupling
     int _space_dim;
     double _origin[3];
     double _dxyz[3];
-    int _structure[3];
+    mcIdType _structure[3];
     std::string _axis_unit;
   };
 }
diff --git a/src/MEDCoupling/MEDCouplingMappedExtrudedMesh.hxx b/src/MEDCoupling/MEDCouplingMappedExtrudedMesh.hxx
index 593b2eef1..ee953833b 100644
--- a/src/MEDCoupling/MEDCouplingMappedExtrudedMesh.hxx
+++ b/src/MEDCoupling/MEDCouplingMappedExtrudedMesh.hxx
@@ -132,8 +132,8 @@ namespace MEDCoupling
     MCAuto<MEDCouplingUMesh> _mesh2D;
     MCAuto<MEDCouplingUMesh> _mesh1D;
     //! New to old 3D cell Ids Array
-    MCAuto<DataArrayInt> _mesh3D_ids;
-    int _cell_2D_id;
+    MCAuto<DataArrayIdType> _mesh3D_ids;
+    mcIdType _cell_2D_id;
   };
 }
 
diff --git a/src/MEDCoupling/MEDCouplingPartDefinition.hxx b/src/MEDCoupling/MEDCouplingPartDefinition.hxx
index 5499eb544..b67902515 100644
--- a/src/MEDCoupling/MEDCouplingPartDefinition.hxx
+++ b/src/MEDCoupling/MEDCouplingPartDefinition.hxx
@@ -74,7 +74,7 @@ namespace MEDCoupling
     DataArrayPartDefinition *add2(const SlicePartDefinition *other) const;
     virtual ~DataArrayPartDefinition();
   private:
-    MCAuto<DataArrayInt> _arr;
+    MCAuto<DataArrayIdType> _arr;
   };
 
   class SlicePartDefinition : public PartDefinition
@@ -103,9 +103,9 @@ namespace MEDCoupling
     PartDefinition *add2(const SlicePartDefinition *other) const;
     virtual ~SlicePartDefinition();
   private:
-    int _start;
-    int _stop;
-    int _step;
+    mcIdType _start;
+    mcIdType _stop;
+    mcIdType _step;
   };
 }
 
diff --git a/src/MEDCoupling/MEDCouplingRemapper.hxx b/src/MEDCoupling/MEDCouplingRemapper.hxx
index 5d7ac9da8..cd9980a9b 100644
--- a/src/MEDCoupling/MEDCouplingRemapper.hxx
+++ b/src/MEDCoupling/MEDCouplingRemapper.hxx
@@ -25,6 +25,7 @@
 #include "MEDCouplingTimeLabel.hxx"
 #include "InterpolationOptions.hxx"
 #include "MEDCouplingNatureOfField.hxx"
+#include "MCType.hxx"
 #include "MCAuto.hxx"
 
 #include "InterpKernelException.hxx"
@@ -118,9 +119,9 @@ namespace MEDCoupling
     InterpolationMatrixPolicy _interp_matrix_pol;
     NatureOfField _nature_of_deno;
     unsigned int _time_deno_update;
-    std::vector<std::map<int,double> > _matrix;
-    std::vector<std::map<int,double> > _deno_multiply;
-    std::vector<std::map<int,double> > _deno_reverse_multiply;
+    std::vector<std::map<mcIdType,double> > _matrix;
+    std::vector<std::map<mcIdType,double> > _deno_multiply;
+    std::vector<std::map<mcIdType,double> > _deno_reverse_multiply;
   };
 }
 
diff --git a/src/MEDCoupling/MEDCouplingSkyLineArray.hxx b/src/MEDCoupling/MEDCouplingSkyLineArray.hxx
index 7c7d04a03..1caef0a76 100644
--- a/src/MEDCoupling/MEDCouplingSkyLineArray.hxx
+++ b/src/MEDCoupling/MEDCouplingSkyLineArray.hxx
@@ -110,9 +110,9 @@ namespace MEDCoupling
     void validIndex(const std::string& func, int index) const;
     void validSuperIndexAndIndex(const std::string& func, int superIndex, int index) const;
 
-    MCAuto<DataArrayInt> _super_index;
-    MCAuto<DataArrayInt> _index;
-    MCAuto<DataArrayInt> _values;
+    MCAuto<DataArrayIdType> _super_index;
+    MCAuto<DataArrayIdType> _index;
+    MCAuto<DataArrayIdType> _values;
   };
 
 }
-- 
2.39.2