X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FMeshCut%2FMeshCut_Utils.cxx;h=f8d26b366916beb9d89a2bbc2826855cedabb714;hb=46c12766bce7d48c0c9ecc772b47ba12a18afb6b;hp=7670a2606cc5061f6aff7b192280fedbde774a31;hpb=b0a908c0d20341651771d0249fb10882f54b2aad;p=modules%2Fsmesh.git

diff --git a/src/Tools/MeshCut/MeshCut_Utils.cxx b/src/Tools/MeshCut/MeshCut_Utils.cxx
index 7670a2606..f8d26b366 100644
--- a/src/Tools/MeshCut/MeshCut_Utils.cxx
+++ b/src/Tools/MeshCut/MeshCut_Utils.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2014  EDF R&D
+// Copyright (C) 2006-2016  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;
@@ -534,7 +535,7 @@ int MESHCUT::copieFichier(std::string source, std::string cible)
 
 med_geometry_type MESHCUT::InstanceMGE(TYPE_MAILLE TYPE)
 {
-  med_geometry_type typeBanaliseMED;
+  med_geometry_type typeBanaliseMED = MED_NONE;
 
   switch (TYPE)
   {
@@ -589,7 +590,7 @@ med_geometry_type MESHCUT::InstanceMGE(TYPE_MAILLE TYPE)
   return typeBanaliseMED;
 }
 
-int MESHCUT::chrono()
+int MESHCUT::salome_chrono()
 {
   return clock() / CLOCKS_PER_SEC;
 }
@@ -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++)