OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0028452: VIS - MSVC 14 compiler warnings

Browse Source 
Includes of VTK headers are wrapped in #pragmas to ensure that MSVC warning messages disabled by VTK headers are still enabled for OCCT code
This commit is contained in:
abv 2017-08-15 16:04:45 +03:00 committed by bugmaster
parent c8fe0e2db4
commit a966092904
16 changed files with 136 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/IVtkDraw/IVtkDraw.cxx
View File

@ -85,6 +85,11 @@
#include <IVtkDraw_HighlightAndSelectionPipeline.hxx>
#include <IVtkDraw_Interactor.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4244)
#endif
#include <vtkAlgorithmOutput.h>
#include <vtkAppendPolyData.h>
#include <vtkBMPWriter.h>
@ -107,7 +112,6 @@
#include <vtkSmartPointer.h>
#include <vtkTIFFWriter.h>
#include <vtkWindowToImageFilter.h>
#ifndef _WIN32
#include <X11/X.h>
#include <X11/Shell.h>
@ -119,6 +123,9 @@
#include <X11/Xutil.h>
#include <tk.h>
#endif
#ifdef _MSC_VER
#pragma warning(pop)
#endif
// workaround name conflicts with OCCT methods (in class TopoDS_Shape for example)
#ifdef Convex

7
src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.cxx
View File

@ -15,6 +15,10 @@
#include <IVtkDraw_HighlightAndSelectionPipeline.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <vtkRenderer.h>
#include <vtkActor.h>
#include <vtkPolyDataMapper.h>
@ -22,6 +26,9 @@
#include <vtkAppendPolyData.h>
#include <vtkProperty.h>
#include <vtkRenderWindow.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <IVtkOCC_Shape.hxx>
#include <IVtkTools_DisplayModeFilter.hxx>

7
src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx
View File

@ -21,11 +21,18 @@
#include <Standard_Transient.hxx>
#include <TopoDS_Shape.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <vtkActor.h>
#include <vtkPolyData.h>
#include <vtkPolyDataMapper.h>
#include <vtkRenderer.h>
#include <vtkSmartPointer.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <IVtk_Types.hxx>
#include <IVtkTools_DisplayModeFilter.hxx>

38
src/IVtkDraw/IVtkDraw_Interactor.cxx
View File

@ -13,10 +13,28 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#ifdef _WIN32
#include <windows.h>
#include <vtkWin32RenderWindowInteractor.h>
#include <vtkWin32OpenGLRenderWindow.h>
#else
#include <GL/glx.h>
#include <vtkXRenderWindowInteractor.h>
#include <vtkXOpenGLRenderWindow.h>
#endif
#include <vtkActor.h>
#include <vtkActorCollection.h>
#include <vtkCommand.h>
#include <vtkObjectFactory.h>
#include <vtkSmartPointer.h>
#include <IVtkDraw_Interactor.hxx>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <IVtkTools_ShapePicker.hxx>
@ -24,28 +42,10 @@
#include <IVtkTools_DisplayModeFilter.hxx>
#include <IVtkTools_ShapeObject.hxx>
#include <IVtkTools_ShapeDataSource.hxx>
#include <IVtkDraw_Interactor.hxx>
#include <Message.hxx>
#include <Message_Messenger.hxx>
#include <vtkActor.h>
#include <vtkActorCollection.h>
#include <vtkCommand.h>
#include <vtkObjectFactory.h>
#include <vtkSmartPointer.h>
#ifndef _WIN32
#include <X11/X.h>
#include <X11/Shell.h>
#include <X11/Xlib.h>
#include <GL/glx.h>
#include <vtkXRenderWindowInteractor.h>
#include <vtkXOpenGLRenderWindow.h>
#include <X11/Xutil.h>
#include <tk.h>
#endif
//===========================================================
// Function : ClearHighlightAndSelection
// Purpose :

8
src/IVtkDraw/IVtkDraw_Interactor.hxx
View File

@ -30,8 +30,16 @@
#include <tk.h>
#endif
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <vtkRenderWindowInteractor.h>
#include <vtkSmartPointer.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <IVtkTools_ShapePicker.hxx>
#include <IVtkDraw_HighlightAndSelectionPipeline.hxx>
#include <Aspect_Window.hxx>

8
src/IVtkTools/IVtkTools.cxx
View File

@ -15,8 +15,16 @@
#include <IVtkTools.hxx>
#include <IVtkVTK_ShapeData.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <vtkLookupTable.h>
#include <vtkMapper.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
namespace IVtkTools
{

8
src/IVtkTools/IVtkTools_DisplayModeFilter.cxx
View File

@ -15,9 +15,17 @@
#include <IVtkTools_DisplayModeFilter.hxx>
#include <IVtkVTK_ShapeData.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <vtkInformation.h>
#include <vtkInformationVector.h>
#include <vtkObjectFactory.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
vtkStandardNewMacro(IVtkTools_DisplayModeFilter)

8
src/IVtkTools/IVtkTools_ShapeDataSource.cxx
View File

@ -18,7 +18,10 @@
#include <IVtkOCC_ShapeMesher.hxx>
#include <IVtkTools_ShapeObject.hxx>
// VTK includes
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <vtkObjectFactory.h>
#include <vtkCellData.h>
#include <vtkIdTypeArray.h>
@ -27,6 +30,9 @@
#include <vtkPolyData.h>
#include <vtkTransform.h>
#include <vtkTransformPolyDataFilter.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
vtkStandardNewMacro(IVtkTools_ShapeDataSource)

8
src/IVtkTools/IVtkTools_ShapeObject.cxx
View File

@ -15,12 +15,20 @@
#include <IVtkTools_ShapeObject.hxx>
#include <IVtkTools_ShapeDataSource.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <vtkActor.h>
#include <vtkObjectFactory.h>
#include <vtkDataSet.h>
#include <vtkInformation.h>
#include <vtkInformationObjectBaseKey.h>
#include <vtkPolyData.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
IVtkTools_ShapeObject::KeyPtr IVtkTools_ShapeObject::myKey = 0;

8
src/IVtkTools/IVtkTools_ShapeObject.hxx
View File

@ -18,9 +18,17 @@
#include <IVtkTools.hxx>
#include <IVtkOCC_Shape.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <vtkDataObject.h>
#include <vtkSetGet.h>
#include <vtkWeakPointer.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
class vtkActor;
class vtkDataSet;

8
src/IVtkTools/IVtkTools_ShapePicker.cxx
View File

@ -16,10 +16,18 @@
#include <IVtkTools_ShapePicker.hxx>
#include <IVtkTools_ShapeObject.hxx>
#include <IVtkVTK_View.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <vtkCommand.h>
#include <vtkObjectFactory.h>
#include <vtkRenderer.h>
#include <vtkActorCollection.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
//! @class IVtkTools_ShapePicker
//! VTK picker implementation for OCCT shapes.

8
src/IVtkTools/IVtkTools_ShapePicker.hxx
View File

@ -19,8 +19,16 @@
#include <IVtkTools.hxx>
#include <IVtk_Types.hxx>
#include <IVtkOCC_ShapePickerAlgo.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <vtkAbstractPropPicker.h>
#include <vtkSmartPointer.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
class vtkRenderer;
class vtkActorCollection;

9
src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx
View File

@ -15,13 +15,20 @@
#include <IVtkTools_SubPolyDataFilter.hxx>
#include <IVtkVTK_ShapeData.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <vtkCellData.h>
#include <vtkIdList.h>
#include <vtkIdTypeArray.h>
#include <vtkInformation.h>
#include <vtkInformationVector.h>
#include <vtkObjectFactory.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
vtkStandardNewMacro(IVtkTools_SubPolyDataFilter)

8
src/IVtkVTK/IVtkVTK_ShapeData.cxx
View File

@ -14,12 +14,20 @@
// commercial license or contractual agreement.
#include <IVtkVTK_ShapeData.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <vtkCellData.h>
#include <vtkDoubleArray.h>
#include <vtkIdList.h>
#include <vtkIdTypeArray.h>
#include <vtkPoints.h>
#include <vtkPolyData.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
IMPLEMENT_STANDARD_RTTIEXT(IVtkVTK_ShapeData,IVtk_IShapeData)

8
src/IVtkVTK/IVtkVTK_ShapeData.hxx
View File

@ -17,8 +17,16 @@
#define __IVTKVTK_SHAPEDATA_H__
#include <IVtk_IShapeData.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <vtkPolyData.h>
#include <vtkSmartPointer.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
class vtkIdTypeArray;

8
src/IVtkVTK/IVtkVTK_View.cxx
View File

@ -15,11 +15,19 @@
#include <IVtkVTK_View.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <vtkAutoInit.h>
#include <vtkCamera.h>
#include <vtkRenderer.h>
#include <vtkRenderWindow.h>
#include <vtkTransform.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
IMPLEMENT_STANDARD_RTTIEXT(IVtkVTK_View,IVtk_IView)