From: isn <isn@opencascade.com>
Date: Mon, 11 Dec 2017 18:53:11 +0000 (+0300)
Subject: comp.errors on linux
X-Git-Tag: v2.1.1__salome84~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bd81def133c235351f4c18834c6660450f16b9ee;p=modules%2Fhydro.git

comp.errors on linux
---

diff --git a/src/HYDROData/HYDROData_DTM.cxx b/src/HYDROData/HYDROData_DTM.cxx
index f4fe6efa..207530f8 100644
--- a/src/HYDROData/HYDROData_DTM.cxx
+++ b/src/HYDROData/HYDROData_DTM.cxx
@@ -99,7 +99,7 @@ HYDROData_DTM::CurveUZ HYDROData_DTM::CurveUZ::operator + ( const CurveUZ& c ) c
   {
     std::cout << "Warning: different number of points in curves: " << n << ", " << n1 << std::endl;
   }
-  int q = min(n, n1);
+  int q = n < n1 ? n : n1;
   res.reserve( q );
   for( int i=0; i<q; i++ )
   {
@@ -859,7 +859,7 @@ std::vector<HYDROData_Bathymetry::AltitudePoints> HYDROData_DTM::Interpolate
   GetProperties( theProfileB, lowestB, dirB, zminB, zmaxB ); 
 
   
-  double hmax = max( zmaxA-zminA, zmaxB-zminB );
+  double hmax = zmaxA-zminA > zmaxB-zminB ? zmaxA-zminA : zmaxB-zminB;
 
   //double dz = zminB - zminA;
   //double zmin = min( zminA, zminB );