From: vsr <vsr@opencascade.com>
Date: Thu, 6 Mar 2008 14:47:10 +0000 (+0000)
Subject: Fix pb with standard libraries
X-Git-Tag: V5_0_0a1~36
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=61ea7d00e0eee380da0d8e3b94c557f405107e19;p=modules%2Fvisu.git

Fix pb with standard libraries
---

diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index 2ea4ef21..eaedc649 100644
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -1369,7 +1369,7 @@ namespace VISU
 //---------------------------------------------------------------
 extern "C"
 VISU_Convertor* 
-CreateConvertor(const string& theFileName)
+CreateConvertor(const std::string& theFileName)
 {
   if(MED::PWrapper aMed = MED::CrWrapper(theFileName,true))
     return new VISU_MedConvertor(theFileName, aMed);
@@ -1377,7 +1377,7 @@ CreateConvertor(const string& theFileName)
 }
 
 VISU_MedConvertor
-::VISU_MedConvertor(const string& theFileName, MED::PWrapper theMed):
+::VISU_MedConvertor(const std::string& theFileName, MED::PWrapper theMed):
   myIsEntitiesDone(false),
   myIsFieldsDone(false),
   myIsGroupsDone(false),
@@ -1602,8 +1602,8 @@ BuildTimeStampMinMax(MED::SharedPtr<TimeStampValueType> theTimeStampValue,
 	vtkFloatingPointType& aMax = aMinMax.second;
 	for(TInt iGauss = 0; iGauss < aNbGauss; iGauss++){
 	  const vtkFloatingPointType& aVal = aMValueSlice[iGauss];
-	  aMin = min(aMin,aVal);
-	  aMax = max(aMax,aVal);
+	  aMin = std::min(aMin,aVal);
+	  aMax = std::max(aMax,aVal);
 	}
       }
     }
@@ -1622,8 +1622,8 @@ BuildTimeStampMinMax(MED::SharedPtr<TimeStampValueType> theTimeStampValue,
 	  aValue += aVal*aVal;
 	}
 	aValue = sqrt(aValue);
-	aMin = min(aMin,aValue);
-	aMax = max(aMax,aValue);
+	aMin = std::min(aMin,aValue);
+	aMax = std::max(aMax,aValue);
       }
     }
   }
@@ -2049,7 +2049,7 @@ VISU_MedConvertor
   }catch(std::exception& exc){
     throw;
   }catch(...){
-    EXCEPTION(runtime_error,"Unknown exception !!!");
+    EXCEPTION(std::runtime_error,"Unknown exception !!!");
   }
 
   return 0;
@@ -2104,7 +2104,7 @@ VISU_MedConvertor
   }catch(std::exception& exc){
     throw;
   }catch(...){
-    EXCEPTION(runtime_error,"Unknown exception !!!");
+    EXCEPTION(std::runtime_error,"Unknown exception !!!");
   }
 
   return 0;
@@ -2208,7 +2208,7 @@ VISU_MedConvertor
 	      
 	      for(int iNode = 0; iNode < aVNbNodes; iNode++) 
 		if(anArray[iNode] < 0 || aNbPoints <= anArray[iNode])
-		  EXCEPTION(runtime_error,"LoadCellsOnEntity - "<<
+		  EXCEPTION(std::runtime_error,"LoadCellsOnEntity - "<<
 			    " aNbPoints("<<aNbPoints<<") "<<
 			    "<= anArray["<<iElem<<"]"<<
 			    "["<<iNode<<"]"<<
@@ -2434,7 +2434,7 @@ VISU_MedConvertor
 	    }
 	    for(int iNode = 0; iNode < aVNbNodes; iNode++) 
 	      if(anArray[iNode] < 0 || aNbPoints <= anArray[iNode])
-		EXCEPTION(runtime_error,"LoadCellsOnEntity - "<<
+		EXCEPTION(std::runtime_error,"LoadCellsOnEntity - "<<
 			  " aNbPoints("<<aNbPoints<<") "<<
 			  "<= anArray["<<iElem<<"]"<<
 			  "["<<iNode<<"]"<<
@@ -2454,7 +2454,7 @@ VISU_MedConvertor
   }catch(std::exception& exc){
     throw;
   }catch(...){
-    EXCEPTION(runtime_error,"Unknown exception !!!");
+    EXCEPTION(std::runtime_error,"Unknown exception !!!");
   }
 #endif
 
@@ -2547,7 +2547,7 @@ VISU_MedConvertor
   }catch(std::exception& exc){
     throw;
   }catch(...){
-    EXCEPTION(runtime_error,"Unknown exception !!!");
+    EXCEPTION(std::runtime_error,"Unknown exception !!!");
   }
 #endif