ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-11 16:19:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

bos #35672: fix std::min issue on windows

Browse Source
This commit is contained in:
Nabil Ghodbane 2023-06-05 11:34:59 +02:00
parent 132bafd2dc
commit 9473f01eac
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
View File

@ -618,7 +618,7 @@ QString MeasureGUI_WhatisDlg::getKindOfShape( QString& theParameters )
"<br>" + tr( "GEOM_NUM_MULTIS" ) + PRINT_INTEGER( anInts[5] ) + "<br>" + tr( "GEOM_NUM_MULTIS" ) + PRINT_INTEGER( anInts[5] ) +
"<br>" + TITLE( "GEOM_POLES" ); "<br>" + TITLE( "GEOM_POLES" );
// Show max. 5 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]) { if (anInts[4] == anInts[2]) {
// Each pole has a specific weight associated // Each pole has a specific weight associated
Standard_Integer widx = anInts[2] * 3 + anInts[3]; // skip poles and knots Standard_Integer widx = anInts[2] * 3 + anInts[3]; // skip poles and knots
@ -642,7 +642,7 @@ QString MeasureGUI_WhatisDlg::getKindOfShape( QString& theParameters )
theParameters += "<br>..."; theParameters += "<br>...";
// Show max. 5 knots // Show max. 5 knots
theParameters += "<br>" + TITLE( "GEOM_KNOTS" ); theParameters += "<br>" + 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 Standard_Integer kidx = anInts[2] * 3; // skip poles
if (anInts[5] == anInts[3]) { if (anInts[5] == anInts[3]) {
// Each knot has a multiplicity associated // Each knot has a multiplicity associated
@ -669,7 +669,7 @@ QString MeasureGUI_WhatisDlg::getKindOfShape( QString& theParameters )
"<br>" + tr( "GEOM_NUM_POLES" ) + PRINT_INTEGER( anInts[0] ) + "<br>" + tr( "GEOM_NUM_POLES" ) + PRINT_INTEGER( anInts[0] ) +
"<br>" + tr( "GEOM_NUM_WEIGHTS" ) + PRINT_INTEGER( anInts[1] ) + "<br>" + tr( "GEOM_NUM_WEIGHTS" ) + PRINT_INTEGER( anInts[1] ) +
"<br>" + TITLE( "GEOM_POLES" ); "<br>" + 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) { if (anInts[1] > 0) {
Standard_Integer widx = anInts[2] * 3 + anInts[3]; Standard_Integer widx = anInts[2] * 3 + anInts[3];
for (i=0; i<nb; i++) { for (i=0; i<nb; i++) {