Copyright update 2020

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

diff --git a/src/Tools/MeshCut/MeshCut_Utils.cxx b/src/Tools/MeshCut/MeshCut_Utils.cxx
index 3a41721cafda0cccae8d70cce7e845831bb84f38..0f28f02c6476a175d7d013d26d8c6ead11631a38 100644 (file)
--- a/src/Tools/MeshCut/MeshCut_Utils.cxx
+++ b/src/Tools/MeshCut/MeshCut_Utils.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2016  EDF R&D
+// Copyright (C) 2006-2020  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
@@ -25,6 +25,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
+#include <algorithm>
 
 using namespace std;
 using namespace MESHCUT;
@@ -924,7 +925,7 @@ void MESHCUT::champType(std::string type, med_entity_type MEM, med_geometry_type
       if (debug)
         {
           cout << endl << "       Liste des valeurs du champ brut aux 3 premiers éléments:" << endl;
-          for (imaille = 0; imaille < min(nmailles, 3); imaille++)
+          for (imaille = 0; imaille < std::min(nmailles, 3); imaille++)
             {
               cout << "         Maille " << imaille << endl;
               for (igauss = 0; igauss < ngauss; igauss++)
@@ -1034,7 +1035,7 @@ float MESHCUT::distance2(float x1, float y1, float z1, float x2, float y2, float
 /*!
  *  Conversion HL-MED d'une table de connectivités
  */
-void MESHCUT::conversionCNX(int *CNXtm, TYPE_MAILLE tm, int N)
+void MESHCUT::conversionCNX(med_int *CNXtm, TYPE_MAILLE tm, int N)
 {
 
   int n = Nnoeuds(tm);