From 9473f01eacaf45ac2371c6b946140c8f35837dfd Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 5 Jun 2023 11:34:59 +0200 Subject: [PATCH] bos #35672: fix std::min issue on windows --- src/MeasureGUI/MeasureGUI_WhatisDlg.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx index bf9417691..1ebeb3e78 100644 --- a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx @@ -618,7 +618,7 @@ QString MeasureGUI_WhatisDlg::getKindOfShape( QString& theParameters ) "
" + tr( "GEOM_NUM_MULTIS" ) + PRINT_INTEGER( anInts[5] ) + "
" + TITLE( "GEOM_POLES" ); // Show max. 5 poles - Standard_Integer i, nb = std::min(5, anInts[2]); + Standard_Integer i, nb = std::min(5L, (long int)anInts[2]); if (anInts[4] == anInts[2]) { // Each pole has a specific weight associated Standard_Integer widx = anInts[2] * 3 + anInts[3]; // skip poles and knots @@ -642,7 +642,7 @@ QString MeasureGUI_WhatisDlg::getKindOfShape( QString& theParameters ) theParameters += "
..."; // Show max. 5 knots theParameters += "
" + TITLE( "GEOM_KNOTS" ); - nb = std::min(5, anInts[3]); + nb = std::min(5L, (long int)anInts[3]); Standard_Integer kidx = anInts[2] * 3; // skip poles if (anInts[5] == anInts[3]) { // Each knot has a multiplicity associated @@ -669,7 +669,7 @@ QString MeasureGUI_WhatisDlg::getKindOfShape( QString& theParameters ) "
" + tr( "GEOM_NUM_POLES" ) + PRINT_INTEGER( anInts[0] ) + "
" + tr( "GEOM_NUM_WEIGHTS" ) + PRINT_INTEGER( anInts[1] ) + "
" + TITLE( "GEOM_POLES" ); - Standard_Integer i, nb = std::min(5, anInts[0]); // show max. 5 poles + Standard_Integer i, nb = std::min(5L, (long int)anInts[0]); // show max. 5 poles if (anInts[1] > 0) { Standard_Integer widx = anInts[2] * 3 + anInts[3]; for (i=0; i