From 47329e0f75d12aaaded4bfc4beb067b6bd141762 Mon Sep 17 00:00:00 2001 From: abd Date: Thu, 17 Jul 2008 11:26:46 +0000 Subject: [PATCH] Executable version on Windows Platform --- src/SMESH/SMESH_2D_Algo.cxx | 3 ++- src/SMESHGUI/SMESHGUI_Filter.h | 12 ++++++------ src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h | 10 +++++----- src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx | 2 +- src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx | 2 +- src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx | 2 +- src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx | 4 ++-- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/SMESH/SMESH_2D_Algo.cxx b/src/SMESH/SMESH_2D_Algo.cxx index ade8abfb7..f2eeaeb14 100644 --- a/src/SMESH/SMESH_2D_Algo.cxx +++ b/src/SMESH/SMESH_2D_Algo.cxx @@ -26,7 +26,6 @@ // Module : SMESH // $Header$ -using namespace std; #include "SMESH_2D_Algo.hxx" #include "SMESH_Gen.hxx" @@ -36,6 +35,8 @@ using namespace std; #include #include +using namespace std; + //============================================================================= /*! * diff --git a/src/SMESHGUI/SMESHGUI_Filter.h b/src/SMESHGUI/SMESHGUI_Filter.h index 8fdbc5a2f..172c1ec53 100755 --- a/src/SMESHGUI/SMESHGUI_Filter.h +++ b/src/SMESHGUI/SMESHGUI_Filter.h @@ -60,7 +60,7 @@ namespace SMESH DEFINE_STANDARD_HANDLE(SMESHGUI_Filter, VTKViewer_Filter) -class SMESHGUI_EXPORT SMESHGUI_Filter : public VTKViewer_Filter +class SMESHGUI_Filter : public VTKViewer_Filter { public: virtual bool IsObjValid( const int ) const = 0; @@ -77,7 +77,7 @@ public: DEFINE_STANDARD_HANDLE(SMESHGUI_PredicateFilter, SMESHGUI_Filter) -class SMESHGUI_EXPORT SMESHGUI_PredicateFilter : public SMESHGUI_Filter +class SMESHGUI_PredicateFilter : public SMESHGUI_Filter { public: SMESHGUI_PredicateFilter(); @@ -105,7 +105,7 @@ public: DEFINE_STANDARD_HANDLE(SMESHGUI_QuadrangleFilter, SMESHGUI_Filter) -class SMESHGUI_EXPORT SMESHGUI_QuadrangleFilter : public SMESHGUI_Filter +class SMESHGUI_QuadrangleFilter : public SMESHGUI_Filter { public: SMESHGUI_QuadrangleFilter(); @@ -127,7 +127,7 @@ public: DEFINE_STANDARD_HANDLE(SMESHGUI_TriangleFilter, SMESHGUI_Filter) -class SMESHGUI_EXPORT SMESHGUI_TriangleFilter : public SMESHGUI_Filter +class SMESHGUI_TriangleFilter : public SMESHGUI_Filter { public: SMESHGUI_TriangleFilter(); @@ -149,7 +149,7 @@ public: DEFINE_STANDARD_HANDLE(SMESHGUI_FacesFilter, SMESHGUI_Filter) -class SMESHGUI_EXPORT SMESHGUI_FacesFilter : public SMESHGUI_Filter +class SMESHGUI_FacesFilter : public SMESHGUI_Filter { public: SMESHGUI_FacesFilter(); @@ -171,7 +171,7 @@ public: DEFINE_STANDARD_HANDLE(SMESHGUI_VolumesFilter, SMESHGUI_Filter) -class SMESHGUI_EXPORT SMESHGUI_VolumesFilter : public SMESHGUI_Filter +class SMESHGUI_VolumesFilter : public SMESHGUI_Filter { public: SMESHGUI_VolumesFilter(); diff --git a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h index 8b5b3a77b..10a58bd20 100644 --- a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h +++ b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h @@ -27,20 +27,20 @@ #define LIBSMESH_SWIG_H #ifdef WNT -#if defined SMESHSWIG_EXPORTS - #define SMESHSWIG_EXPORT __declspec( dllexport ) +#if defined SMESH_SWIG_EXPORTS + #define SMESH_SWIG_EXPORT __declspec( dllexport ) #else - #define SMESHSWIG_EXPORT __declspec( dllimport ) + #define SMESH_SWIG_EXPORT __declspec( dllimport ) #endif #else - #define SMESHSWIG_EXPORT + #define SMESH_SWIG_EXPORT #endif // IDL includes #include #include CORBA_SERVER_HEADER(SALOMEDS) -class SMESHSWIG_EXPORT SMESH_Swig +class SMESH_SWIG_EXPORT SMESH_Swig { public: SMESH_Swig(); diff --git a/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx b/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx index e0eedabdb..780d97d83 100644 --- a/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx +++ b/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx @@ -49,7 +49,7 @@ public: }; -class StdMeshers_UseExisting_1D: public SMESH_1D_Algo +class STDMESHERS_EXPORT StdMeshers_UseExisting_1D: public SMESH_1D_Algo { public: StdMeshers_UseExisting_1D(int hypId, int studyId, SMESH_Gen* gen); diff --git a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx index fc3787b9e..4d7bcb552 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx @@ -263,7 +263,7 @@ void StdMeshersGUI_DistrPreview::update() } setAxisScale( myDensity->xAxis(), min_x, max_x ); - setAxisScale( myDensity->yAxis(), std::min( 0.0, min_y ), std::max( 0.0, max_y ) ); + setAxisScale( myDensity->yAxis(), min( 0.0, min_y ), max( 0.0, max_y ) ); myDensity->setData( x, y, size ); if( x ) delete[] x; diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx index a53902294..09721ce97 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx @@ -27,7 +27,6 @@ // Module : SMESH // $Header$ -using namespace std; #include "StdMeshers_NumberOfSegments_i.hxx" #include "SMESH_Gen_i.hxx" #include "SMESH_Gen.hxx" @@ -38,6 +37,7 @@ using namespace std; #include +using namespace std; //============================================================================= /*! * StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx index e3d5f4eeb..a1543f7a5 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx @@ -26,8 +26,6 @@ // Module : SMESH // $Header$ -using namespace std; - #include "StdMeshers_ProjectionSource1D_i.hxx" #include "SMESH_Gen_i.hxx" @@ -39,6 +37,8 @@ using namespace std; #include "StdMeshers_ObjRefUlils.hxx" +using namespace std; + //============================================================================= /*! * StdMeshers_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_i -- 2.39.2