From bd81def133c235351f4c18834c6660450f16b9ee Mon Sep 17 00:00:00 2001 From: isn Date: Mon, 11 Dec 2017 21:53:11 +0300 Subject: [PATCH] comp.errors on linux --- src/HYDROData/HYDROData_DTM.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 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 ); -- 2.30.2