patch for warnings

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index 2cf4fc27aa9ebedd70bfcbaf322025c54a880941..8d2363c7a2ecf8d50f3296f678b0497198bd6948 100644 (file)
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -16,10 +16,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifdef WIN32
-  #pragma warning ( disable: 4251 )
-#endif
-
 #include "HYDROData_CalculationCase.h"
 #include "HYDROData_ArtificialObject.h"
 #include "HYDROData_IAltitudeObject.h"
@@ -35,10 +31,18 @@
 #include "HYDROData_Tool.h"
 #include "HYDROData_GeomTool.h"
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #ifndef LIGHT_MODE
 #include <GEOMBase.h>
 #endif
 
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
+
 #include <QSet>
 
 #include <TopoDS.hxx>
@@ -72,10 +76,6 @@
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #endif
 
-#ifdef WIN32
-  #pragma warning ( default: 4251 )
-#endif
-
 #define EXPORT_NAME "HYDRO_" + GetName()
 
 IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)

diff --git a/src/HYDROData/HYDROData_CalculationCase.h b/src/HYDROData/HYDROData_CalculationCase.h
index 4320e4fc5f71d082dc1bec4d04facc52e82f8554..c055663c34843d60a9d5319a674ffc6d857925b9 100644 (file)
--- a/src/HYDROData/HYDROData_CalculationCase.h
+++ b/src/HYDROData/HYDROData_CalculationCase.h
@@ -25,12 +25,20 @@
 #include <HYDROData_Zone.h>
 #include <HYDROData_Warning.h>
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #ifndef LIGHT_MODE
 // IDL includes
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 #endif
 
+#ifdef WIN32
+  #pragma warning( default: 4251 )
+#endif
+
 class gp_XY;
 
 class TopoDS_Shape;

diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx
index 9efffe9468e43cff10aff1bf2961a5eb955424c7..13ba16f7581e87e26633ffcedd7949fd68013c09 100644 (file)
--- a/src/HYDROData/HYDROData_Channel.cxx
+++ b/src/HYDROData/HYDROData_Channel.cxx
@@ -25,7 +25,6 @@
 #include "HYDROData_Projection.h"
 #include "HYDROData_ShapesGroup.h"
 #include "HYDROData_ShapesTool.h"
-#include "HYDROData_Pipes.h"
 #include "HYDROData_Stream.h"
 #include "HYDROData_Tool.h"
 

diff --git a/src/HYDROData/HYDROData_Document.h b/src/HYDROData/HYDROData_Document.h
index f79ebad255f8940ff683d38d228914a99e8e884c..6f3c82290ac73cc38fe756f4be00667bc68b58d8 100644 (file)
--- a/src/HYDROData/HYDROData_Document.h
+++ b/src/HYDROData/HYDROData_Document.h
@@ -20,7 +20,6 @@
 #define HYDROData_Document_HeaderFile
 
 #include <HYDROData_Entity.h>
-
 #include <TDocStd_Document.hxx>
 
 class HYDROData_InterpolatorsFactory;

diff --git a/src/HYDROData/HYDROData_GeomTool.cxx b/src/HYDROData/HYDROData_GeomTool.cxx
index 037306f3534424718fed8c96e4d5d0a5d14f3572..7517677a5653c00d5b6629d706ff6dccfe76a6f7 100644 (file)
--- a/src/HYDROData/HYDROData_GeomTool.cxx
+++ b/src/HYDROData/HYDROData_GeomTool.cxx
@@ -24,9 +24,17 @@
 
 #include <BRepTools.hxx>
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #include <SALOME_NamingService.hxx>
 #include <SALOME_LifeCycleCORBA.hxx>
 
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
+
 #include <QStringList>
 #include <QSet>
 

diff --git a/src/HYDROData/HYDROData_GeomTool.h b/src/HYDROData/HYDROData_GeomTool.h
index 8f87204fa093a50a242fbdfa17daa9e38d60bf8e..278e6cafc84cf9b577eb880bc451961f494e64ca 100644 (file)
--- a/src/HYDROData/HYDROData_GeomTool.h
+++ b/src/HYDROData/HYDROData_GeomTool.h
@@ -21,9 +21,17 @@
 
 #include "HYDROData.h"
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #ifndef LIGHT_MODE
 #include <GEOM_Client.hxx>
 
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
+
 class TopoDS_Shape;
 class QString;
 

diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx
index b7ec1096ac9388886b0eee97984c45381809d7d6..64af6de3cf9103010b3830263de53821707b8775 100644 (file)
--- a/src/HYDROData/HYDROData_Image.cxx
+++ b/src/HYDROData/HYDROData_Image.cxx
@@ -30,12 +30,20 @@
 #include <TDataStd_UAttribute.hxx>
 #include <TDataStd_AsciiString.hxx>
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #include <ImageComposer_Operator.h>
 #include <ImageComposer_MetaTypes.h>
 
 #include <QStringList>
 #include <QFile>
 
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
+
 #include <boost/math/special_functions/fpclassify.hpp>
 
 static const Standard_GUID GUID_SELF_SPLITTED("997995aa-5c19-40bf-9a60-ab4b70ad04d8");

diff --git a/src/HYDROData/HYDROData_Image.h b/src/HYDROData/HYDROData_Image.h
index ed5892111304b3f371c95a4329ab01336fec12ab..fcbb657fa81cdcefc4d57f3074025818f36a0e94 100644 (file)
--- a/src/HYDROData/HYDROData_Image.h
+++ b/src/HYDROData/HYDROData_Image.h
@@ -21,9 +21,17 @@
 
 #include <HYDROData_Entity.h>
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #include <QImage>
 #include <QTransform>
 
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
+
 DEFINE_STANDARD_HANDLE(HYDROData_Image, HYDROData_Entity)
 
 /**\class HYDROData_Image

diff --git a/src/HYDROData/HYDROData_Iterator.cxx b/src/HYDROData/HYDROData_Iterator.cxx
index c92eda184b1f50141dbf8d2f09df8b4dfe960b6f..210975044d9f29a662671d24f64e7200b99628ea 100644 (file)
--- a/src/HYDROData/HYDROData_Iterator.cxx
+++ b/src/HYDROData/HYDROData_Iterator.cxx
@@ -23,27 +23,27 @@
 #include "HYDROData_CalculationCase.h"
 #include "HYDROData_Channel.h"
 #include "HYDROData_Confluence.h"
-#include "HYDROData_DummyObject3D.h"
 #include "HYDROData_Digue.h"
-#include "HYDROData_ShapesGroup.h"
+#include "HYDROData_DummyObject3D.h"
 #include "HYDROData_Image.h"
 #include "HYDROData_ImmersibleZone.h"
+#include "HYDROData_LandCover.h"
+#include "HYDROData_LandCoverMap.h"
 #include "HYDROData_Obstacle.h"
 #include "HYDROData_ObstacleAltitude.h"
 #include "HYDROData_Polyline3D.h"
 #include "HYDROData_PolylineXY.h"
 #include "HYDROData_Profile.h"
 #include "HYDROData_ProfileUZ.h"
-#include "HYDROData_VisualState.h"
 #include "HYDROData_Region.h"
 #include "HYDROData_River.h"
+#include "HYDROData_ShapesGroup.h"
 #include "HYDROData_SplittedShapesGroup.h"
 #include "HYDROData_Stream.h"
 #include "HYDROData_StreamAltitude.h"
+#include "HYDROData_VisualState.h"
 #include "HYDROData_Zone.h"
 #include "HYDROData_StricklerTable.h"
-#include "HYDROData_LandCover.h"
-#include "HYDROData_LandCoverMap.h"
 
 #include <TDataStd_Name.hxx>
 #include <TDataStd_NamedData.hxx>

diff --git a/src/HYDROData/HYDROData_Obstacle.cxx b/src/HYDROData/HYDROData_Obstacle.cxx
index 0c1d8e69e54533604b5b4be25149dd0aa39860fd..9c7f58b9a18b1322da083d44e067cb231c4209af 100644 (file)
--- a/src/HYDROData/HYDROData_Obstacle.cxx
+++ b/src/HYDROData/HYDROData_Obstacle.cxx
@@ -24,10 +24,18 @@
 #include "HYDROData_Tool.h"
 #include "HYDROData_GeomTool.h"
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #ifndef LIGHT_MODE
 #include <Basics_Utils.hxx>
 #endif
 
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
+
 #include <BRepTools.hxx>
 #include <BRep_Builder.hxx>
 
@@ -50,11 +58,19 @@
 
 #include <TopExp_Explorer.hxx>
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #include <QColor>
 #include <QFile>
 #include <QFileInfo>
 #include <QStringList>
 
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
+
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic
 
 #include <HYDROData_Projection.h>