From 417ce59dd7738fab8f771af4dd8a56e177c23787 Mon Sep 17 00:00:00 2001 From: abd Date: Fri, 3 Oct 2008 11:07:03 +0000 Subject: [PATCH] Win32 Porting. Correction of Export/Import defines for Win32 platform. Removed "using namespace std" from header files. --- src/BasicGUI/BasicGUI_CurveDlg.h | 2 +- src/DlgRef/DlgRef_Skeleton_QTD.h | 4 ++- src/GEOMClient/GEOM_Client.cxx | 8 ++--- src/GEOMClient/GEOM_Client.hxx | 22 ++++--------- src/GEOMGUI/GEOM_Displayer.h | 4 +-- src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx | 4 +-- src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx | 10 +++--- src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx | 2 ++ src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx | 10 +++--- src/GEOMImpl/GEOMImpl_IHealingOperations.cxx | 4 +-- src/GEOMImpl/GEOMImpl_IHealingOperations.hxx | 16 ++++----- src/GEOMImpl/GEOMImpl_ILocalOperations.cxx | 4 +-- src/GEOMImpl/GEOMImpl_ILocalOperations.hxx | 18 +++++------ src/GEOMImpl/GEOMImpl_IShapesOperations.cxx | 4 ++- src/GEOMImpl/GEOMImpl_IShapesOperations.hxx | 34 +++++++++----------- src/GEOM_I/GEOM_Gen_i.cc | 2 ++ src/GEOM_I/GEOM_IBlocksOperations_i.cc | 2 ++ src/GEOM_I/GEOM_ICurvesOperations_i.cc | 2 ++ src/GEOM_I/GEOM_IHealingOperations_i.cc | 2 ++ src/GEOM_I/GEOM_ILocalOperations_i.cc | 2 ++ src/GEOM_I/GEOM_IShapesOperations_i.cc | 2 ++ src/GEOM_I/GEOM_Object_i.cc | 2 ++ src/GroupGUI/GroupGUI_GroupDlg.cxx | 2 ++ src/IGESExport/IGESExport.cxx | 22 ++++--------- 24 files changed, 88 insertions(+), 96 deletions(-) diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h index 6a1b6fa9b..84b301d7d 100644 --- a/src/BasicGUI/BasicGUI_CurveDlg.h +++ b/src/BasicGUI/BasicGUI_CurveDlg.h @@ -63,7 +63,7 @@ private : DlgRef_1Sel_QTD* GroupPoints; GEOM::ListOfGO_var myPoints; - list myOrderedSel;//!< This list used for managing orderes selection + std::list myOrderedSel;//!< This list used for managing orderes selection private slots: void ClickOnOk(); diff --git a/src/DlgRef/DlgRef_Skeleton_QTD.h b/src/DlgRef/DlgRef_Skeleton_QTD.h index 2b8e06d25..833dacbf8 100644 --- a/src/DlgRef/DlgRef_Skeleton_QTD.h +++ b/src/DlgRef/DlgRef_Skeleton_QTD.h @@ -10,6 +10,8 @@ #ifndef DLGREF_SKELETON_QTD_H #define DLGREF_SKELETON_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include @@ -25,7 +27,7 @@ class QLineEdit; class QCheckBox; class QPushButton; -class DlgRef_Skeleton_QTD : public QDialog +class GEOM_DLGREF_EXPORT DlgRef_Skeleton_QTD : public QDialog { Q_OBJECT diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx index 5f89234b9..edf71f147 100644 --- a/src/GEOMClient/GEOM_Client.cxx +++ b/src/GEOMClient/GEOM_Client.cxx @@ -26,8 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; - #include #include @@ -36,7 +34,7 @@ using namespace std; #include "GEOM_Client.hxx" #include -#include "OpUtil.hxx" +#include "Basics_Utils.hxx" #include "utilities.h" #include @@ -60,7 +58,7 @@ using namespace std; #define HST_CLIENT_LEN 256 - +using namespace std; //======================================================================= // function : Load() @@ -68,7 +66,7 @@ using namespace std; //======================================================================= TopoDS_Shape GEOM_Client::Load( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape ) { - string hst_client = GetHostname(); + string hst_client = Kernel_Utils::GetHostname(); Engines::Container_var ctn_server = geom->GetContainerRef(); long pid_server = ctn_server->getPID(); diff --git a/src/GEOMClient/GEOM_Client.hxx b/src/GEOMClient/GEOM_Client.hxx index 161fcc105..98f04af36 100644 --- a/src/GEOMClient/GEOM_Client.hxx +++ b/src/GEOMClient/GEOM_Client.hxx @@ -52,22 +52,14 @@ class TopoDS_Shape; #include #endif -#ifdef WNT - #if defined GEOMCLIENT_EXPORTS - #if defined WIN32 - #define GEOMCLIENT_EXPORT __declspec( dllexport ) - #else - #define GEOMCLIENT_EXPORT - #endif - #else - #if defined WIN32 - #define GEOMCLIENT_EXPORT __declspec( dllimport ) - #else - #define GEOMCLIENT_EXPORT - #endif - #endif +#ifdef WIN32 +# ifdef GEOMCLIENT_EXPORTS +# define GEOMCLIENT_EXPORT __declspec( dllexport ) +# else +# define GEOMCLIENT_EXPORT __declspec( dllimport ) +# endif #else - #define GEOMCLIENT_EXPORT +# define GEOMCLIENT_EXPORT #endif //===================================================================== diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index e5b736e7a..d2efda391 100644 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -29,8 +29,6 @@ #if !defined (__GEOM_DISPLAYER_H) #define __GEOM_DISPLAYER_H -using namespace std; - #include "GEOM_GEOMGUI.hxx" #include "SALOME_Prs.h" @@ -176,7 +174,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 22032807a..6be4c561b 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx @@ -21,8 +21,6 @@ #pragma warning( disable:4786 ) #endif -using namespace std; - #include #include @@ -99,6 +97,8 @@ using namespace std; #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 8248df00f..e6d048104 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx @@ -21,8 +21,6 @@ #ifndef _GEOMImpl_IBlocksOperations_HXX_ #define _GEOMImpl_IBlocksOperations_HXX_ -using namespace std; - #include "GEOM_IOperations.hxx" #include @@ -114,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.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx index 6585c9f7e..6d74db335 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx @@ -47,6 +47,8 @@ #include #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC +using namespace std; + //============================================================================= /*! * constructor: diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx index ed6605d0d..a55b32656 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx @@ -17,8 +17,6 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -using namespace std; - #ifndef _GEOMImpl_ICurvesOperations_HXX_ #define _GEOMImpl_ICurvesOperations_HXX_ @@ -36,7 +34,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 +58,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 char* theCommand, - list theWorkingPlane); + std::list theWorkingPlane); Standard_EXPORT Handle(GEOM_Object) MakeSketcherOnPlane (const char* theCommand, Handle(GEOM_Object) theWorkingPlane); }; diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx index bf9a60316..614757094 100644 --- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx @@ -24,8 +24,6 @@ #pragma warning( disable:4786 ) #endif -using namespace std; - #include #include @@ -57,6 +55,8 @@ using namespace std; #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 119873d19..0084d09d1 100644 --- a/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx @@ -18,8 +18,6 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -using namespace std; - #ifndef _GEOMImpl_IHealingOperations_HXX_ #define _GEOMImpl_IHealingOperations_HXX_ @@ -44,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 std::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.cxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx index 90467d2b9..f672bf40b 100644 --- a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx @@ -18,8 +18,6 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -using namespace std; - #include #include @@ -57,6 +55,8 @@ using namespace std; #include #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC +using namespace std; + //============================================================================= /*! * constructor: diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx index ba1972e37..bceffa675 100644 --- a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx @@ -21,8 +21,6 @@ #ifndef _GEOMImpl_ILocalOperations_HXX_ #define _GEOMImpl_ILocalOperations_HXX_ -using namespace std; - #include "Utils_SALOME_Exception.hxx" #include "GEOM_IOperations.hxx" #include "GEOM_Engine.hxx" @@ -38,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, @@ -57,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 c6874faaa..f0b83cd55 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -23,7 +23,6 @@ // Project : SALOME // $Header$ -using namespace std; #include @@ -132,6 +131,9 @@ using namespace std; #include #include +using namespace std; + + //============================================================================= /*! * constructor: diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx index 5791ebce9..8955f32cb 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx @@ -28,8 +28,6 @@ #ifndef _GEOMImpl_IShapesOperations_HXX_ #define _GEOMImpl_IShapesOperations_HXX_ -using namespace std; - #include "GEOM_IOperations.hxx" #include "GEOMAlgo_State.hxx" @@ -56,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, @@ -80,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, @@ -257,10 +255,10 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations * \retval Handle(TColStd_HSequenceOfTransient) - found shape objects */ Standard_EXPORT Handle(TColStd_HSequenceOfTransient) - GetShapesOnBox(const Handle(GEOM_Object)& theBox, - const Handle(GEOM_Object)& theShape, - const Standard_Integer theShapeType, - GEOMAlgo_State theState); + GetShapesOnBox(const Handle(GEOM_Object)& theBox, + const Handle(GEOM_Object)& theShape, + const Standard_Integer theShapeType, + GEOMAlgo_State theState); /*! * \brief Find IDs of subshapes complying with given status about surface @@ -320,7 +318,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); @@ -404,11 +402,11 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations /*! * \brief Find IDs of subshapes complying with given status about surface - * \param theBox - the box to check state of subshapes against - * \param theShape - the shape to explore - * \param theShapeType - type of subshape of theShape - * \param theState - required state - * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes + * \param theBox - the box to check state of subshapes against + * \param theShape - the shape to explore + * \param theShapeType - type of subshape of theShape + * \param theState - required state + * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes */ Handle(TColStd_HSequenceOfInteger) getShapesOnBoxIDs(const Handle(GEOM_Object)& theBox, const Handle(GEOM_Object)& theShape, diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 8b1aa51c8..0c440ceeb 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -51,6 +51,8 @@ #include "SALOMEDS_Tool.hxx" +using namespace std; + //============================================================================ // function : GEOM_Gen_i() // purpose : constructor to be called for servant creation. diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.cc b/src/GEOM_I/GEOM_IBlocksOperations_i.cc index f8a1d2a20..57e9e8769 100644 --- a/src/GEOM_I/GEOM_IBlocksOperations_i.cc +++ b/src/GEOM_I/GEOM_IBlocksOperations_i.cc @@ -31,6 +31,8 @@ #include #include +using namespace std; + //============================================================================= /*! * constructor: diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.cc b/src/GEOM_I/GEOM_ICurvesOperations_i.cc index 7762d6192..7a97741a8 100644 --- a/src/GEOM_I/GEOM_ICurvesOperations_i.cc +++ b/src/GEOM_I/GEOM_ICurvesOperations_i.cc @@ -27,6 +27,8 @@ #include "GEOM_Engine.hxx" #include "GEOM_Object.hxx" +using namespace std; + //============================================================================= /*! * constructor: diff --git a/src/GEOM_I/GEOM_IHealingOperations_i.cc b/src/GEOM_I/GEOM_IHealingOperations_i.cc index cdd3f1efe..139af611e 100644 --- a/src/GEOM_I/GEOM_IHealingOperations_i.cc +++ b/src/GEOM_I/GEOM_IHealingOperations_i.cc @@ -31,6 +31,8 @@ #include +using namespace std; + //============================================================================= /*! * constructor: diff --git a/src/GEOM_I/GEOM_ILocalOperations_i.cc b/src/GEOM_I/GEOM_ILocalOperations_i.cc index a9ec1fc6d..98e1c9004 100644 --- a/src/GEOM_I/GEOM_ILocalOperations_i.cc +++ b/src/GEOM_I/GEOM_ILocalOperations_i.cc @@ -28,6 +28,8 @@ #include "GEOM_Engine.hxx" #include "GEOM_Object.hxx" +using namespace std; + //============================================================================= /*! * constructor: diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.cc b/src/GEOM_I/GEOM_IShapesOperations_i.cc index a1430f88a..da73da5ac 100644 --- a/src/GEOM_I/GEOM_IShapesOperations_i.cc +++ b/src/GEOM_I/GEOM_IShapesOperations_i.cc @@ -31,6 +31,8 @@ #include #include +using namespace std; + //============================================================================= /*! * constructor: diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc index 4a86443b6..9d9b084f3 100644 --- a/src/GEOM_I/GEOM_Object_i.cc +++ b/src/GEOM_I/GEOM_Object_i.cc @@ -42,6 +42,8 @@ #pragma warning( disable:4786 ) #endif +using namespace std; + //============================================================================= /*! * constructor: diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx index 41109a732..c70ed11e9 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.cxx +++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx @@ -48,6 +48,8 @@ #include #include +using namespace std; + enum { ALL_SUBSHAPES = 0, GET_IN_PLACE, SUBSHAPES_OF_SHAPE2 }; GroupGUI_GroupDlg::GroupGUI_GroupDlg(Mode mode, GeometryGUI* theGeometryGUI, QWidget* parent) diff --git a/src/IGESExport/IGESExport.cxx b/src/IGESExport/IGESExport.cxx index e4a031650..1ddaf777d 100644 --- a/src/IGESExport/IGESExport.cxx +++ b/src/IGESExport/IGESExport.cxx @@ -31,22 +31,14 @@ #include #include -#ifdef WNT - #if defined IGESEXPORT_EXPORTS - #if defined WIN32 - #define IGESEXPORT_EXPORT __declspec( dllexport ) - #else - #define IGESEXPORT_EXPORT - #endif - #else - #if defined WIN32 - #define IGESEXPORT_EXPORT __declspec( dllimport ) - #else - #define IGESEXPORT_EXPORT - #endif - #endif +#ifdef WIN32 +# ifdef IGESEXPORT_EXPORTS +# define IGESEXPORT_EXPORT __declspec( dllexport ) +# else +# define IGESEXPORT_EXPORT __declspec( dllimport ) +# endif #else - #define IGESEXPORT_EXPORT +# define IGESEXPORT_EXPORT #endif //=============================================================================