From 61d3ca66fe13030f3b20b90e45d6a44b5fc7694a Mon Sep 17 00:00:00 2001 From: abd Date: Wed, 9 Apr 2008 08:44:48 +0000 Subject: [PATCH] first executable version --- src/GEOMBase/GEOMBase_aWarningDlg.h | 4 +++- src/GEOMClient/GEOM_Client.cxx | 4 ++++ src/GEOMGUI/GEOM_Displayer.h | 2 +- src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx | 2 ++ src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx | 8 ++++---- src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx | 8 ++++---- src/GEOMImpl/GEOMImpl_IHealingOperations.cxx | 2 ++ src/GEOMImpl/GEOMImpl_IHealingOperations.hxx | 14 +++++++------- src/GEOMImpl/GEOMImpl_ILocalOperations.hxx | 16 ++++++++-------- src/GEOMImpl/GEOMImpl_IShapesOperations.cxx | 2 ++ src/GEOMImpl/GEOMImpl_IShapesOperations.hxx | 14 +++++++------- src/GEOM_I/GEOM_IOperations_i.cc | 5 ++--- src/GEOM_I/GEOM_IOperations_i.hh | 5 +++-- src/GEOM_I/GEOM_IShapesOperations_i.cc | 12 ++++++++---- src/GEOM_I/GEOM_IShapesOperations_i.hh | 5 ++--- src/GEOM_I/GEOM_Object_i.cc | 4 +--- src/GEOM_I/GEOM_Object_i.hh | 7 +++---- src/GroupGUI/GroupGUI_GroupDlg.cxx | 3 +++ src/OBJECT/GEOM_DeviceActor.h | 5 +++-- src/OBJECT/GEOM_EdgeSource.h | 5 +++-- src/OBJECT/GEOM_FaceSource.h | 3 ++- src/OBJECT/GEOM_OBJECT_defs.hxx | 20 ++++++-------------- src/OBJECT/GEOM_ShadingFace.h | 5 +++-- src/OBJECT/GEOM_VertexSource.h | 3 ++- src/OBJECT/GEOM_WireframeFace.h | 3 ++- 25 files changed, 87 insertions(+), 74 deletions(-) diff --git a/src/GEOMBase/GEOMBase_aWarningDlg.h b/src/GEOMBase/GEOMBase_aWarningDlg.h index 6601062bb..8e9da3481 100644 --- a/src/GEOMBase/GEOMBase_aWarningDlg.h +++ b/src/GEOMBase/GEOMBase_aWarningDlg.h @@ -29,6 +29,8 @@ #ifndef GEOMBase_aWarningDLG_H #define GEOMBase_aWarningDLG_H +#include "GEOM_GEOMBase.hxx" + #include #include @@ -39,7 +41,7 @@ class QPushButton; // class : GEOMBase_aWarningDlg // purpose : //================================================================================= -class GEOMBase_aWarningDlg : public QDialog +class GEOMBASE_EXPORT GEOMBase_aWarningDlg : public QDialog { Q_OBJECT diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx index 3e8eb2058..4c2c91975 100644 --- a/src/GEOMClient/GEOM_Client.cxx +++ b/src/GEOMClient/GEOM_Client.cxx @@ -53,11 +53,15 @@ #include #endif +#include + #include CORBA_SERVER_HEADER(SALOMEDS) #include CORBA_SERVER_HEADER(GEOM_Gen) #define HST_CLIENT_LEN 256 +using namespace std; + //======================================================================= diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index dc51f139a..87a3f74e7 100644 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -173,7 +173,7 @@ protected: protected: Handle(SALOME_InteractiveObject) myIO; TopoDS_Shape myShape; - string myName; + std::string myName; int myType; SALOME_View* myViewFrame; diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx index 252a39d7f..6be4c561b 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx @@ -97,6 +97,8 @@ #include #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC +using namespace std; + //============================================================================= /*! * constructor: diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx index 9b8414308..e6d048104 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx @@ -112,17 +112,17 @@ class GEOMImpl_IBlocksOperations : public GEOM_IOperations { struct BCError { BCErrorType error; - list incriminated; + std::list incriminated; }; Standard_EXPORT Standard_Boolean CheckCompoundOfBlocksOld (Handle(GEOM_Object) theCompound, - list& theErrors); + std::list& theErrors); Standard_EXPORT Standard_Boolean CheckCompoundOfBlocks (Handle(GEOM_Object) theCompound, - list& theErrors); + std::list& theErrors); Standard_EXPORT TCollection_AsciiString PrintBCErrors (Handle(GEOM_Object) theCompound, - const list& theErrors); + const std::list& theErrors); Standard_EXPORT Handle(GEOM_Object) RemoveExtraEdges (Handle(GEOM_Object) theShape); diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx index 34bb01148..04ac4f3df 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx @@ -36,7 +36,7 @@ class GEOMImpl_ICurvesOperations : public GEOM_IOperations { Standard_EXPORT GEOMImpl_ICurvesOperations(GEOM_Engine* theEngine, int theDocID); Standard_EXPORT ~GEOMImpl_ICurvesOperations(); - Standard_EXPORT Handle(GEOM_Object) MakePolyline (list thePoints); + Standard_EXPORT Handle(GEOM_Object) MakePolyline (std::list thePoints); Standard_EXPORT Handle(GEOM_Object) MakeCircleThreePnt (Handle(GEOM_Object) thePnt1, Handle(GEOM_Object) thePnt2, @@ -60,11 +60,11 @@ class GEOMImpl_ICurvesOperations : public GEOM_IOperations { Handle(GEOM_Object) thePnt3, bool theSense); - Standard_EXPORT Handle(GEOM_Object) MakeSplineBezier (list thePoints); - Standard_EXPORT Handle(GEOM_Object) MakeSplineInterpolation (list thePoints); + Standard_EXPORT Handle(GEOM_Object) MakeSplineBezier (std::list thePoints); + Standard_EXPORT Handle(GEOM_Object) MakeSplineInterpolation (std::list thePoints); Standard_EXPORT Handle(GEOM_Object) MakeSketcher (const TCollection_AsciiString& theCommand, - list theWorkingPlane); + std::list theWorkingPlane); Standard_EXPORT Handle(GEOM_Object) MakeSketcherOnPlane (const TCollection_AsciiString& theCommand, Handle(GEOM_Object) theWorkingPlane); }; diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx index 9e67bc310..47dde616f 100644 --- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx @@ -52,6 +52,8 @@ #include #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC +using namespace std; + //============================================================================= /*! diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx index 3b36d040f..0d4c57f09 100644 --- a/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx @@ -42,17 +42,17 @@ class GEOMImpl_IHealingOperations : public GEOM_IOperations { const Handle(TColStd_HArray1OfExtendedString)& theValues ); // Retrieve default Shape Process parameters (from resource file) - Standard_EXPORT void GetShapeProcessParameters( list& theOperations, - list& theParams, - list& theValues ); + Standard_EXPORT void GetShapeProcessParameters( std::list& theOperations, + std::list& theParams, + std::list& theValues ); // Retrieve default Shape Process parameters for given operator - Standard_EXPORT bool GetOperatorParameters( const string theOperation, - list& theParams, - list& theValues ); + Standard_EXPORT bool GetOperatorParameters( const std::string theOperation, + std::list& theParams, + std::list& theValues ); // returns all parameters that are valid for the given operation (Shape Process operator) - Standard_EXPORT static bool GetParameters( const string theOperation, list& theParams ); + Standard_EXPORT static bool GetParameters( const string theOperation, std::list& theParams ); Standard_EXPORT Handle(GEOM_Object) SuppressFaces( Handle(GEOM_Object) theObject, const Handle(TColStd_HArray1OfInteger)& theFaces); diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx index 479d1dc8b..bceffa675 100644 --- a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx @@ -36,15 +36,15 @@ class GEOMImpl_ILocalOperations : public GEOM_IOperations { Standard_EXPORT Handle(GEOM_Object) MakeFilletAll (Handle(GEOM_Object) theShape, double theR); Standard_EXPORT Handle(GEOM_Object) MakeFilletEdges (Handle(GEOM_Object) theShape, double theR, - list theEdges); + std::list theEdges); Standard_EXPORT Handle(GEOM_Object) MakeFilletEdgesR1R2 (Handle(GEOM_Object) theShape, double theR1, double theR2, - list theEdges); + std::list theEdges); Standard_EXPORT Handle(GEOM_Object) MakeFilletFaces (Handle(GEOM_Object) theShape, double theR, - list theFaces); + std::list theFaces); Standard_EXPORT Handle(GEOM_Object) MakeFilletFacesR1R2 (Handle(GEOM_Object) theShape, double theR1, double theR2, - list theFaces); + std::list theFaces); Standard_EXPORT Handle(GEOM_Object) MakeChamferAll (Handle(GEOM_Object) theShape, double theD); Standard_EXPORT Handle(GEOM_Object) MakeChamferEdge (Handle(GEOM_Object) theShape, @@ -55,16 +55,16 @@ class GEOMImpl_ILocalOperations : public GEOM_IOperations { int theFace1, int theFace2); Standard_EXPORT Handle(GEOM_Object) MakeChamferFaces (Handle(GEOM_Object) theShape, double theD1, double theD2, - list theFaces); + std::list theFaces); Standard_EXPORT Handle(GEOM_Object) MakeChamferFacesAD (Handle(GEOM_Object) theShape, double theD, double theAngle, - list theFaces); + std::list theFaces); Standard_EXPORT Handle(GEOM_Object) MakeChamferEdges (Handle(GEOM_Object) theShape, double theD1, double theD2, - list theEdges); + std::list theEdges); Standard_EXPORT Handle(GEOM_Object) MakeChamferEdgesAD (Handle(GEOM_Object) theShape, double theD, double theAngle, - list theEdges); + std::list theEdges); Standard_EXPORT Handle(GEOM_Object) MakeArchimede (Handle(GEOM_Object) theShape, double theWeight, double theWaterDensity, double theMeshingDeflection); diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx index 4f09b784d..ff5f7a137 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -127,6 +127,8 @@ #include #include +using namespace std; + //============================================================================= /*! * constructor: diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx index 1e8cdc2c8..8e5c6067f 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx @@ -54,20 +54,20 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations Standard_EXPORT Handle(GEOM_Object) MakeEdge (Handle(GEOM_Object) thePoint1, Handle(GEOM_Object) thePoint2); - Standard_EXPORT Handle(GEOM_Object) MakeWire (list theEdgesAndWires); + Standard_EXPORT Handle(GEOM_Object) MakeWire (std::list theEdgesAndWires); Standard_EXPORT Handle(GEOM_Object) MakeFace (Handle(GEOM_Object) theWire, const bool isPlanarWanted); - Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (list theWires, + Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (std::list theWires, const bool isPlanarWanted); - Standard_EXPORT Handle(GEOM_Object) MakeShell (list theShapes); + Standard_EXPORT Handle(GEOM_Object) MakeShell (std::list theShapes); Standard_EXPORT Handle(GEOM_Object) MakeSolidShell (Handle(GEOM_Object) theShell); - Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (list theShells); + Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (std::list theShells); - Standard_EXPORT Handle(GEOM_Object) MakeCompound (list theShapes); + Standard_EXPORT Handle(GEOM_Object) MakeCompound (std::list theShapes); Standard_EXPORT Handle(GEOM_Object) MakeGlueFaces (Handle(GEOM_Object) theShape, const Standard_Real theTolerance, @@ -78,7 +78,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations Standard_EXPORT Handle(GEOM_Object) MakeGlueFacesByList (Handle(GEOM_Object) theShape, const Standard_Real theTolerance, - list theFaces, + std::list theFaces, const Standard_Boolean doKeepNonSolids); Standard_EXPORT Handle(TColStd_HSequenceOfTransient) MakeExplode (Handle(GEOM_Object) theShape, @@ -285,7 +285,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations Standard_EXPORT static bool CheckTriangulation (const TopoDS_Shape& theShape); private: - Handle(GEOM_Object) MakeShape (list theShapes, + Handle(GEOM_Object) MakeShape (std::list theShapes, const Standard_Integer theObjectType, const Standard_Integer theFunctionType, const TCollection_AsciiString& theMethodName); diff --git a/src/GEOM_I/GEOM_IOperations_i.cc b/src/GEOM_I/GEOM_IOperations_i.cc index 3d5c87c46..c3481a721 100644 --- a/src/GEOM_I/GEOM_IOperations_i.cc +++ b/src/GEOM_I/GEOM_IOperations_i.cc @@ -18,14 +18,13 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GEOM_IOperations_i.hh" - -#include "GEOM_Engine.hxx" +#include "GEOM_Object.hxx" +#include "GEOM_IOperations.hxx" #include "utilities.h" #include "OpUtil.hxx" #include "Utils_ExceptHandlers.hxx" -#include #include #include diff --git a/src/GEOM_I/GEOM_IOperations_i.hh b/src/GEOM_I/GEOM_IOperations_i.hh index c425449dc..52f4c55b9 100644 --- a/src/GEOM_I/GEOM_IOperations_i.hh +++ b/src/GEOM_I/GEOM_IOperations_i.hh @@ -17,16 +17,17 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // - #ifndef _GEOM_IOperations_i_HeaderFile #define _GEOM_IOperations_i_HeaderFile +#include "GEOM_GEOM_I.hxx" + #include "GEOMImpl_Gen.hxx" #include - #include CORBA_SERVER_HEADER(GEOM_Gen) #include "SALOME_GenericObj_i.hh" + #include "GEOM_IOperations.hxx" #include "GEOM_Object_i.hh" #include "GEOM_Object.hxx" diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.cc b/src/GEOM_I/GEOM_IShapesOperations_i.cc index 6d9bf7fcc..a8c79b8a5 100644 --- a/src/GEOM_I/GEOM_IShapesOperations_i.cc +++ b/src/GEOM_I/GEOM_IShapesOperations_i.cc @@ -17,7 +17,8 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include +#include "GEOM_Object.hxx" +#include "GEOMImpl_IShapesOperations.hxx" #include "GEOM_IShapesOperations_i.hh" @@ -25,12 +26,15 @@ #include "OpUtil.hxx" #include "Utils_ExceptHandlers.hxx" -#include "GEOM_Engine.hxx" -#include "GEOM_Object.hxx" - #include #include +#include + +using namespace std; + +//#define GetObjectA GetObject + //============================================================================= /*! * constructor: diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.hh b/src/GEOM_I/GEOM_IShapesOperations_i.hh index de1b24be1..be1ac19b7 100644 --- a/src/GEOM_I/GEOM_IShapesOperations_i.hh +++ b/src/GEOM_I/GEOM_IShapesOperations_i.hh @@ -21,13 +21,12 @@ #ifndef _GEOM_IShapesOperations_i_HeaderFile #define _GEOM_IShapesOperations_i_HeaderFile -#include "GEOMImpl_Gen.hxx" +#include "GEOM_GEOM_I.hxx" #include - #include CORBA_SERVER_HEADER(GEOM_Gen) #include "GEOM_IOperations_i.hh" -#include "GEOM_Object_i.hh" +#include "GEOMImpl_Gen.hxx" #include "GEOMImpl_IShapesOperations.hxx" diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc index 4a86443b6..80537ccf6 100644 --- a/src/GEOM_I/GEOM_Object_i.cc +++ b/src/GEOM_I/GEOM_Object_i.cc @@ -17,10 +17,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include - #include -//#include #include #include @@ -34,6 +31,7 @@ #include #include +#include #include #include #include diff --git a/src/GEOM_I/GEOM_Object_i.hh b/src/GEOM_I/GEOM_Object_i.hh index 56631b7f0..7e9717bc5 100644 --- a/src/GEOM_I/GEOM_Object_i.hh +++ b/src/GEOM_I/GEOM_Object_i.hh @@ -23,18 +23,17 @@ #include "GEOM_GEOM_I.hxx" -#include "GEOMImpl_Gen.hxx" - #include -#include CORBA_CLIENT_HEADER(SALOMEDS) #include CORBA_SERVER_HEADER(GEOM_Gen) - +#include CORBA_CLIENT_HEADER(SALOMEDS) #include "SALOME_GenericObj_i.hh" +#include "GEOMImpl_Gen.hxx" #include "GEOM_Object.hxx" #include + class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual SALOME::GenericObj_i { public: diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx index 5aafaee7c..cdf215c7d 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.cxx +++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx @@ -46,6 +46,9 @@ #include #include +#include +using namespace std; + GroupGUI_GroupDlg::GroupGUI_GroupDlg(Mode mode, GeometryGUI* theGeometryGUI, QWidget* parent) :GEOMBase_Skeleton( theGeometryGUI, parent, "GroupGUI_GroupDlg", false, diff --git a/src/OBJECT/GEOM_DeviceActor.h b/src/OBJECT/GEOM_DeviceActor.h index 85809daf5..6baa1819c 100755 --- a/src/OBJECT/GEOM_DeviceActor.h +++ b/src/OBJECT/GEOM_DeviceActor.h @@ -1,6 +1,7 @@ #ifndef GEOM_DEVICEACTOR_H #define GEOM_DEVICEACTOR_H - + +#include "GEOM_OBJECT_defs.hxx" #include "GEOM_SmartPtr.h" class vtkPoints; @@ -24,7 +25,7 @@ class vtkRenderer; #include -class VTK_EXPORT GEOM_DeviceActor: public vtkObject +class GEOM_OBJECT_EXPORT GEOM_DeviceActor: public vtkObject { public: vtkTypeMacro(GEOM_DeviceActor,vtkObject); diff --git a/src/OBJECT/GEOM_EdgeSource.h b/src/OBJECT/GEOM_EdgeSource.h index 56813e0fb..adea72756 100755 --- a/src/OBJECT/GEOM_EdgeSource.h +++ b/src/OBJECT/GEOM_EdgeSource.h @@ -1,6 +1,7 @@ #ifndef GEOM_EDGESOURCE_H #define GEOM_EDGESOURCE_H - + +#include "GEOM_OBJECT_defs.hxx" #include "GEOM_DeviceActor.h" #include @@ -11,7 +12,7 @@ typedef NCollection_Set TEdgeSet; #include -class VTK_EXPORT GEOM_EdgeSource: public vtkPolyDataSource +class GEOM_OBJECT_EXPORT GEOM_EdgeSource: public vtkPolyDataSource { public: vtkTypeMacro(GEOM_EdgeSource,vtkPolyDataSource); diff --git a/src/OBJECT/GEOM_FaceSource.h b/src/OBJECT/GEOM_FaceSource.h index 8c03167af..54d83a938 100755 --- a/src/OBJECT/GEOM_FaceSource.h +++ b/src/OBJECT/GEOM_FaceSource.h @@ -1,6 +1,7 @@ #ifndef GEOM_FACESOURCE_H #define GEOM_FACESOURCE_H +#include "GEOM_OBJECT_defs.hxx" #include "GEOM_DeviceActor.h" #include @@ -15,7 +16,7 @@ class GEOM_FaceSource; typedef GEOM_SmartPtr PFaceSource; -class VTK_EXPORT GEOM_FaceSource: public vtkPolyDataSource +class GEOM_OBJECT_EXPORT GEOM_FaceSource: public vtkPolyDataSource { public: vtkTypeMacro(GEOM_FaceSource,vtkPolyDataSource); diff --git a/src/OBJECT/GEOM_OBJECT_defs.hxx b/src/OBJECT/GEOM_OBJECT_defs.hxx index 3377ce908..3900b5152 100755 --- a/src/OBJECT/GEOM_OBJECT_defs.hxx +++ b/src/OBJECT/GEOM_OBJECT_defs.hxx @@ -27,21 +27,13 @@ #define _GEOM_OBJECT_defs_HXX_ #ifdef WNT - #if defined OBJECT_EXPORTS - #if defined WIN32 - #define GEOM_OBJECT_EXPORT __declspec( dllexport ) - #else - #define GEOM_OBJECT_EXPORT - #endif - #else - #if defined WIN32 - #define GEOM_OBJECT_EXPORT __declspec( dllimport ) - #else - #define GEOM_OBJECT_EXPORT - #endif - #endif +# if defined GEOM_OBJECT_EXPORTS +# define GEOM_OBJECT_EXPORT __declspec( dllexport ) +# else +# define GEOM_OBJECT_EXPORT __declspec( dllimport ) +# endif #else - #define GEOM_OBJECT_EXPORT +# define GEOM_OBJECT_EXPORT #endif #endif diff --git a/src/OBJECT/GEOM_ShadingFace.h b/src/OBJECT/GEOM_ShadingFace.h index 4414f9f29..e940de698 100755 --- a/src/OBJECT/GEOM_ShadingFace.h +++ b/src/OBJECT/GEOM_ShadingFace.h @@ -1,10 +1,11 @@ #ifndef GEOM_SHADINGFACE_H #define GEOM_SHADINGFACE_H - + +#include "GEOM_OBJECT_defs.hxx" #include "GEOM_FaceSource.h" -class VTK_EXPORT GEOM_ShadingFace: public GEOM_FaceSource +class GEOM_OBJECT_EXPORT GEOM_ShadingFace: public GEOM_FaceSource { public: vtkTypeMacro(GEOM_ShadingFace,GEOM_FaceSource); diff --git a/src/OBJECT/GEOM_VertexSource.h b/src/OBJECT/GEOM_VertexSource.h index 46a64f0de..7d30f9a2a 100755 --- a/src/OBJECT/GEOM_VertexSource.h +++ b/src/OBJECT/GEOM_VertexSource.h @@ -1,6 +1,7 @@ #ifndef GEOM_VERTEXSOURCE_H #define GEOM_VERTEXSOURCE_H +#include "GEOM_OBJECT_defs.hxx" #include "GEOM_DeviceActor.h" #include @@ -11,7 +12,7 @@ typedef NCollection_Set TVertexSet; #include -class VTK_EXPORT GEOM_VertexSource: public vtkPolyDataSource +class GEOM_OBJECT_EXPORT GEOM_VertexSource: public vtkPolyDataSource { public: vtkTypeMacro(GEOM_VertexSource,vtkPolyDataSource); diff --git a/src/OBJECT/GEOM_WireframeFace.h b/src/OBJECT/GEOM_WireframeFace.h index cdbe122b3..cb855669c 100755 --- a/src/OBJECT/GEOM_WireframeFace.h +++ b/src/OBJECT/GEOM_WireframeFace.h @@ -1,6 +1,7 @@ #ifndef GEOM_WIREFRAME_FACE_H #define GEOM_WIREFRAME_FACE_H +#include "GEOM_OBJECT_defs.hxx" #include "GEOM_FaceSource.h" #include @@ -9,7 +10,7 @@ #include -class VTK_EXPORT GEOM_WireframeFace: public GEOM_FaceSource +class GEOM_OBJECT_EXPORT GEOM_WireframeFace: public GEOM_FaceSource { public: vtkTypeMacro(GEOM_WireframeFace,GEOM_FaceSource); -- 2.39.2