Merge branch 'occ/shaper2smesh'

[modules/smesh.git] / src / Tools / MeshCut / MeshCut_Utils.hxx

diff --git a/src/Tools/MeshCut/MeshCut_Utils.hxx b/src/Tools/MeshCut/MeshCut_Utils.hxx
index df52ed3a9b96f1600151e9ce2c769cfc56d5037e..72b9bfd4ea3d81325e5f82cf3749c1947860dbf2 100644 (file)
--- a/src/Tools/MeshCut/MeshCut_Utils.hxx
+++ b/src/Tools/MeshCut/MeshCut_Utils.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2016  EDF R&D
+// Copyright (C) 2006-2019  EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -57,7 +57,7 @@ namespace MESHCUT
 
     int copieFichier(std::string source, std::string cible);
     med_geometry_type InstanceMGE(TYPE_MAILLE TYPE);
-    int chrono();
+    int salome_chrono();
     TYPE_MAILLE typeMaille(std::string type);
     std::string MGE2string(med_geometry_type MGE);
     std::string TM2string(TYPE_MAILLE MGE);
@@ -71,7 +71,7 @@ namespace MESHCUT
     std::string nomMaille(TYPE_MAILLE tm, int nl);
     bool appartientVN(int n, std::vector<int> V);
     float distance2(float x1, float y1, float z1, float x2, float y2, float z2);
-    void conversionCNX(int *CNXtm, TYPE_MAILLE tm, int N);
+    void conversionCNX(med_int *CNXtm, TYPE_MAILLE tm, int N);
 
   }