From a5001f955901a91fd39f7841d351bb50d766df87 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 8 Oct 2010 14:55:05 +0000 Subject: [PATCH] windows port --- src/SMESHGUI/SMESHGUI_FilterDlg.cxx | 2 +- src/SMESH_I/SMESH_MeshEditor_i.cxx | 4 ++++ src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx index b7424e035..e15798710 100755 --- a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx @@ -317,7 +317,7 @@ void SMESHGUI_FilterTable::AdditionalWidget::SetPrecision(const int theId, const if ( qobject_cast( myWidgets[ theId ] ) ) { SMESHGUI_SpinBox* sb = qobject_cast( myWidgets[ theId ] ); double val = sb->GetValue(); - double min = pow(10, -(sb->decimals())); + double min = pow(10.0, -(sb->decimals())); sb->RangeStepAndValidator( 0., 1.e20, 0.1, precision ? precision : "len_tol_precision" ); sb->SetValue( qMax( val, min ) ); } diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx index 1a457eefb..6aca887bd 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.cxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx @@ -25,6 +25,10 @@ // Author : Nicolas REJNERI // Module : SMESH // +#ifdef WNT +#define NOMINMAX +#endif + #include "SMESH_MeshEditor_i.hxx" #include "SMDS_Mesh0DElement.hxx" diff --git a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx index 5f56d5d78..39dfd2e13 100644 --- a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx +++ b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx @@ -60,7 +60,7 @@ namespace */ //================================================================================ - class SMDS_EXPORT Q2TAdaptor_Triangle : public SMDS_MeshFace + class STDMESHERS_EXPORT Q2TAdaptor_Triangle : public SMDS_MeshFace { const SMDS_MeshNode* _nodes[3]; public: -- 2.39.2