From: rnv <rnv@opencascade.com>
Date: Thu, 29 Apr 2021 21:12:39 +0000 (+0300)
Subject: NOMINMAX definition has been moved into CONFIGURATION repository.
X-Git-Tag: V9_7_0rc1^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Frnv%2F64ids_win;p=modules%2Fgeom.git

NOMINMAX definition has been moved into CONFIGURATION repository.
---

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
index 38e58971b..d719134ad 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
@@ -169,11 +169,7 @@ void GEOMToolsGUI_MarkerDlg::setStandardMarker( GEOM::marker_type type, GEOM::ma
     myTypeGroup->button( 0 )->setChecked( true );
     myWGStack->setCurrentIndex( 0 );
     myStdTypeCombo->setCurrentId( (int)type );
-#ifdef WIN32
-    int asize = max( (int)GEOM::MS_10, min( (int)GEOM::MS_70, (int)size ) );
-#else
     int asize = std::max( (int)GEOM::MS_10, std::min( (int)GEOM::MS_70, (int)size ) );
-#endif
     myStdScaleCombo->setCurrentId( asize );
   }
 }