Merge branch 'V9_9_BR'

[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 36eb22d0feed8a365a3f35d0aff5b9e041695402..f274ef1c79f0316859f48037fb87d440f6e4794a 100644 (file)
--- a/src/Tools/MeshCut/MeshCut_Utils.hxx
+++ b/src/Tools/MeshCut/MeshCut_Utils.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2006-2012  EDF R&D
+// Copyright (C) 2006-2022  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,10 +20,7 @@
 #ifndef __MESHCUT_UTILS_HXX__
 #define __MESHCUT_UTILS_HXX__
 
-extern "C"
-  {
 #include <med.h>
-  }
 
 #include <string>
 #include <vector>
@@ -60,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);
@@ -74,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);
 
   }