Update C++ API consecutively to previous integration

diff --git a/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.cxx b/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.cxx
index d5e84c0a0b5674366f905ad34e81b7eea29754ba..281ac4de5559c3687496e27f30263608723a5d35 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.cxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.cxx
@@ -144,7 +144,7 @@ MEDCoupling::MEDFileData* MEDPARTITIONER::MEDPartitioner::getMEDFileData()
   return _output_collection->retrieveDriver()->getMEDFileData();
 }
 
-MEDPARTITIONER::Graph* MEDPARTITIONER::MEDPartitioner::Graph(MEDCoupling::MEDCouplingSkyLineArray* graph, Graph::splitter_type split, int* edgeweight, DataArrayInt *vlbloctab)
+MEDPARTITIONER::Graph* MEDPARTITIONER::MEDPartitioner::Graph(MEDCoupling::MEDCouplingSkyLineArray* graph, Graph::splitter_type split, int* edgeweight, DataArrayIdType *vlbloctab)
 {
   MEDPARTITIONER::Graph* cellGraph=0;
   // will be destroyed by XXXGraph class:

diff --git a/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.hxx b/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.hxx
index e020b731cac88a7890b5aabea090a004a34029f1..fe5a1306ae8f18e1a24582f351e82472b03050cc 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.hxx
@@ -44,7 +44,7 @@ namespace MEDPARTITIONER
     MEDPartitioner(const std::string& filename, int ndomains=1, const std::string& library="metis",bool create_boundary_faces=false, bool create_joints=false, bool mesure_memory=false);
     MEDPartitioner(const MEDCoupling::MEDFileData* fileData, int ndomains=1, const std::string& library="metis",bool create_boundary_faces=false, bool create_joints=false, bool mesure_memory=false);
     MEDPartitioner(const MEDCoupling::MEDFileData* fileData, Graph* graph, bool create_boundary_faces=false, bool create_joints=false, bool mesure_memory=false);
-    static MEDPARTITIONER::Graph* Graph(MEDCoupling::MEDCouplingSkyLineArray* graph, Graph::splitter_type split=Graph::METIS, int* edgeweight=0, DataArrayInt* vlbloctab=0);
+    static MEDPARTITIONER::Graph* Graph(MEDCoupling::MEDCouplingSkyLineArray* graph, Graph::splitter_type split=Graph::METIS, int* edgeweight=0, DataArrayIdType* vlbloctab=0);
     static std::vector<std::string> AvailableAlgorithms();
     static std::vector<std::string> AllAlgorithms();
     static bool HasMetisAlg();

diff --git a/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.cxx b/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.cxx
index 3d44cb216c01286afcff6d0ecd2a419bf8b10a3f..a5498c2039223beccb4f25be6b391409a0779c62 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.cxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.cxx
@@ -38,7 +38,7 @@ extern "C"
 using namespace MEDPARTITIONER;
 
 
-PTSCOTCHGraph::PTSCOTCHGraph(MEDCoupling::MEDCouplingSkyLineArray *graph, int *edgeweight, DataArrayInt *vlbloctab):Graph(graph,edgeweight),_vlbloctab(vlbloctab)
+PTSCOTCHGraph::PTSCOTCHGraph(MEDCoupling::MEDCouplingSkyLineArray *graph, int *edgeweight, DataArrayIdType *vlbloctab):Graph(graph,edgeweight),_vlbloctab(vlbloctab)
 {
 }
 

diff --git a/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.hxx b/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.hxx
index 986d8abecbd98b5427b02ee8f79973cf6ed947aa..b584ec358fe7af35f5dfb868991559906dd0abb0 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.hxx
@@ -36,11 +36,11 @@ namespace MEDPARTITIONER
   {
   public:
     PTSCOTCHGraph() { }
-    PTSCOTCHGraph(MEDCoupling::MEDCouplingSkyLineArray* , int *edgeweight=0, DataArrayInt *vlbloctab=0);
+    PTSCOTCHGraph(MEDCoupling::MEDCouplingSkyLineArray* , int *edgeweight=0, DataArrayIdType *vlbloctab=0);
     virtual ~PTSCOTCHGraph();
     void partGraph(int ndomain, const std::string& options_string="", ParaDomainSelector* sel=0);
   protected:
-    MEDCoupling::DataArrayInt *_vlbloctab;
+    MEDCoupling::DataArrayIdType *_vlbloctab;
   };
 }