From 660e6f7a98935b2ab471f6734b8be1ce4ce81dd2 Mon Sep 17 00:00:00 2001 From: asl Date: Thu, 15 Oct 2015 08:17:18 +0300 Subject: [PATCH] patch for warnings --- src/HYDROData/HYDROData_CalculationCase.cxx | 16 ++++++++-------- src/HYDROData/HYDROData_CalculationCase.h | 8 ++++++++ src/HYDROData/HYDROData_Channel.cxx | 1 - src/HYDROData/HYDROData_Document.h | 1 - src/HYDROData/HYDROData_GeomTool.cxx | 8 ++++++++ src/HYDROData/HYDROData_GeomTool.h | 8 ++++++++ src/HYDROData/HYDROData_Image.cxx | 8 ++++++++ src/HYDROData/HYDROData_Image.h | 8 ++++++++ src/HYDROData/HYDROData_Iterator.cxx | 10 +++++----- src/HYDROData/HYDROData_Obstacle.cxx | 16 ++++++++++++++++ 10 files changed, 69 insertions(+), 15 deletions(-) diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx index 2cf4fc27..8d2363c7 100644 --- 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 #endif +#ifdef WIN32 + #pragma warning ( default: 4251 ) +#endif + #include #include @@ -72,10 +76,6 @@ #include #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 4320e4fc..c055663c 100644 --- a/src/HYDROData/HYDROData_CalculationCase.h +++ b/src/HYDROData/HYDROData_CalculationCase.h @@ -25,12 +25,20 @@ #include #include +#ifdef WIN32 + #pragma warning ( disable: 4251 ) +#endif + #ifndef LIGHT_MODE // IDL includes #include #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 9efffe94..13ba16f7 100644 --- 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 f79ebad2..6f3c8229 100644 --- a/src/HYDROData/HYDROData_Document.h +++ b/src/HYDROData/HYDROData_Document.h @@ -20,7 +20,6 @@ #define HYDROData_Document_HeaderFile #include - #include class HYDROData_InterpolatorsFactory; diff --git a/src/HYDROData/HYDROData_GeomTool.cxx b/src/HYDROData/HYDROData_GeomTool.cxx index 037306f3..7517677a 100644 --- a/src/HYDROData/HYDROData_GeomTool.cxx +++ b/src/HYDROData/HYDROData_GeomTool.cxx @@ -24,9 +24,17 @@ #include +#ifdef WIN32 + #pragma warning ( disable: 4251 ) +#endif + #include #include +#ifdef WIN32 + #pragma warning ( default: 4251 ) +#endif + #include #include diff --git a/src/HYDROData/HYDROData_GeomTool.h b/src/HYDROData/HYDROData_GeomTool.h index 8f87204f..278e6caf 100644 --- 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 +#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 b7ec1096..64af6de3 100644 --- a/src/HYDROData/HYDROData_Image.cxx +++ b/src/HYDROData/HYDROData_Image.cxx @@ -30,12 +30,20 @@ #include #include +#ifdef WIN32 + #pragma warning ( disable: 4251 ) +#endif + #include #include #include #include +#ifdef WIN32 + #pragma warning ( default: 4251 ) +#endif + #include 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 ed589211..fcbb657f 100644 --- a/src/HYDROData/HYDROData_Image.h +++ b/src/HYDROData/HYDROData_Image.h @@ -21,9 +21,17 @@ #include +#ifdef WIN32 + #pragma warning ( disable: 4251 ) +#endif + #include #include +#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 c92eda18..21097504 100644 --- 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 #include diff --git a/src/HYDROData/HYDROData_Obstacle.cxx b/src/HYDROData/HYDROData_Obstacle.cxx index 0c1d8e69..9c7f58b9 100644 --- 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 #endif +#ifdef WIN32 + #pragma warning ( default: 4251 ) +#endif + #include #include @@ -50,11 +58,19 @@ #include +#ifdef WIN32 + #pragma warning ( disable: 4251 ) +#endif + #include #include #include #include +#ifdef WIN32 + #pragma warning ( default: 4251 ) +#endif + #include // CAREFUL ! position of this file is critic #include -- 2.39.2