X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FMeshCut%2FMeshCut_Utils.hxx;h=ecfaa437ccbb3ea7daea6fdf25e1373524e4a0ec;hb=2c5e4604a9a792ebc68fc34533207b3225035c5f;hp=36eb22d0feed8a365a3f35d0aff5b9e041695402;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6;p=modules%2Fsmesh.git diff --git a/src/Tools/MeshCut/MeshCut_Utils.hxx b/src/Tools/MeshCut/MeshCut_Utils.hxx index 36eb22d0f..ecfaa437c 100644 --- 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-2021 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 - } #include #include @@ -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 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); }