Win32 Porting.

Correction of Export/Import defines for Win32 platform.
Removed "using namespace std" from header files.

diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h
index 6a1b6fa9b054cab14274291e9aefe0b85a485e57..84b301d7d467dccc33519032ba98b4d9a1466aca 100644 (file)
--- 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<GEOM::GEOM_Object_var> myOrderedSel;//!< This list used for managing orderes selection
+    std::list<GEOM::GEOM_Object_var> 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 2b8e06d25d6c231b870e875388cb501f26c3e7d8..833dacbf8baeacf1cfab8abab091d54de94db124 100644 (file)
--- 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 <qvariant.h>
 #include <qdialog.h>
 
@@ -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 5f89234b9c25892ae1ec7eeb5a60054bbb7483bc..edf71f147fe6842afd5f1b3231dc503026ff345f 100644 (file)
--- a/src/GEOMClient/GEOM_Client.cxx
+++ b/src/GEOMClient/GEOM_Client.cxx
@@ -26,8 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
-
 #include <Standard_Stream.hxx>
 
 #include <Standard_Stream.hxx>
@@ -36,7 +34,7 @@ using namespace std;
 
 #include "GEOM_Client.hxx"
 #include <SALOMEconfig.h>
-#include "OpUtil.hxx"
+#include "Basics_Utils.hxx"
 #include "utilities.h"
 
 #include <BRep_Builder.hxx>
@@ -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 161fcc1051ae5ca61dc1822d7cf644e7f04a2d8f..98f04af3630f58a48b8c2a0af3792467c13de64f 100644 (file)
--- a/src/GEOMClient/GEOM_Client.hxx
+++ b/src/GEOMClient/GEOM_Client.hxx
@@ -52,22 +52,14 @@ class TopoDS_Shape;
 #include <Standard_Macro.hxx>
 #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 e5b736e7a1ff0d8d8f738811c1556b55ec3e9261..d2efda391196acd60888533d9fdc9ad0fd5ec9b1 100644 (file)
--- 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 22032807a8cc367a97c4cda8984925a06c45b4b8..6be4c561b8c53fb8b1269fc09ddfef8d4b0c01c3 100644 (file)
--- 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_IBlocksOperations.hxx>
@@ -99,6 +97,8 @@ using namespace std;
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // 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 8248df00f512a1b63e35aa5f845fce4c7cf7b5b0..e6d048104c793dd191759fdc00a31805c4835214 100644 (file)
--- 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 <TopTools_ListOfShape.hxx>
@@ -114,17 +112,17 @@ class GEOMImpl_IBlocksOperations : public GEOM_IOperations {
 
   struct BCError {
     BCErrorType error;
-    list<int>   incriminated;
+    std::list<int>   incriminated;
   };
 
   Standard_EXPORT Standard_Boolean CheckCompoundOfBlocksOld (Handle(GEOM_Object) theCompound,
-                                             list<BCError>&      theErrors);
+                                             std::list<BCError>&      theErrors);
 
   Standard_EXPORT Standard_Boolean CheckCompoundOfBlocks (Handle(GEOM_Object) theCompound,
-                                          list<BCError>&      theErrors);
+                                          std::list<BCError>&      theErrors);
 
   Standard_EXPORT TCollection_AsciiString PrintBCErrors (Handle(GEOM_Object)  theCompound,
-                                         const list<BCError>& theErrors);
+                                         const std::list<BCError>& 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 6585c9f7e706731f26ed8e7b6d093d1ea0820f4a..6d74db335d5b5ed8b67033d762fc4183bb0a83e7 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
@@ -47,6 +47,8 @@
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // 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 ed6605d0dbc62d84ceb744096666751ecfa52eb3..a55b32656f20ce16e04a2339ccd50af72721d100 100644 (file)
--- 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<Handle(GEOM_Object)> thePoints);
+  Standard_EXPORT Handle(GEOM_Object) MakePolyline (std::list<Handle(GEOM_Object)> 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<Handle(GEOM_Object)> thePoints);
-  Standard_EXPORT Handle(GEOM_Object) MakeSplineInterpolation (list<Handle(GEOM_Object)> thePoints);
+  Standard_EXPORT Handle(GEOM_Object) MakeSplineBezier        (std::list<Handle(GEOM_Object)> thePoints);
+  Standard_EXPORT Handle(GEOM_Object) MakeSplineInterpolation (std::list<Handle(GEOM_Object)> thePoints);
 
   Standard_EXPORT Handle(GEOM_Object) MakeSketcher (const char* theCommand,
-                                                    list<double> theWorkingPlane);
+                                                    std::list<double> 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 bf9a60316b8808847b0971909575b53186199174..614757094708c1311d5a7316aef716facfc65615 100644 (file)
--- 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_IHealingOperations.hxx>
@@ -57,6 +55,8 @@ using namespace std;
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // 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 119873d19a2bbf194fe718a94054151e6d2c3a11..0084d09d1c5d7aaaf72dfaf2ce5270da21b1734e 100644 (file)
--- 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<string>& theOperations,
-                                  list<string>& theParams,
-                                  list<string>& theValues );
+  Standard_EXPORT void GetShapeProcessParameters( std::list<std::string>& theOperations,
+                                  std::list<std::string>& theParams,
+                                  std::list<std::string>& theValues );
 
   // Retrieve default Shape Process parameters for given operator
-  Standard_EXPORT bool GetOperatorParameters( const string theOperation, 
-                              list<string>& theParams,
-                              list<string>& theValues );
+  Standard_EXPORT bool GetOperatorParameters( const std::string theOperation, 
+                              std::list<std::string>& theParams,
+                              std::list<std::string>& theValues );
 
   // returns all parameters that are valid for the given operation (Shape Process operator)
-  Standard_EXPORT static bool GetParameters( const string theOperation, list<string>& theParams );                                      
+  Standard_EXPORT static bool GetParameters( const std::string theOperation, std::list<std::string>& 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 90467d2b9f60fcffebedbc1344f63e6285444ff0..f672bf40b08c3eaf38d5f924f315735deda80fda 100644 (file)
--- 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_ILocalOperations.hxx>
@@ -57,6 +55,8 @@ using namespace std;
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // 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 ba1972e3763b35ae92a674fccd76bfe715efa6b3..bceffa675d784602c00dd35558884920cf2b19c6 100644 (file)
--- 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<int> theEdges);
+                                       std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletEdgesR1R2 (Handle(GEOM_Object) theShape,
                                                            double theR1, double theR2,
-                                                           list<int> theEdges);
+                                                           std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletFaces (Handle(GEOM_Object) theShape, double theR,
-                                       list<int> theFaces);
+                                       std::list<int> theFaces);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletFacesR1R2 (Handle(GEOM_Object) theShape,
                                                            double theR1, double theR2,
-                                                           list<int> theFaces);
+                                                           std::list<int> 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<int> theFaces);
+                                        std::list<int> theFaces);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferFacesAD (Handle(GEOM_Object) theShape,
                                         double theD, double theAngle,
-                                        list<int> theFaces);
+                                        std::list<int> theFaces);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferEdges (Handle(GEOM_Object) theShape,
                                         double theD1, double theD2,
-                                        list<int> theEdges);
+                                        std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferEdgesAD (Handle(GEOM_Object) theShape,
                                         double theD, double theAngle,
-                                        list<int> theEdges);
+                                        std::list<int> 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 c6874faaa41ba573b6a4d9813c16b5a63ff5fe62..f0b83cd556605a5a3ecc08e2bba865d02e6adca6 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
@@ -23,7 +23,6 @@
 // Project   : SALOME
 // $Header$
 
-using namespace std;
 
 #include <Standard_Stream.hxx>
 
@@ -132,6 +131,9 @@ using namespace std;
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <Precision.hxx>
 
+using namespace std;
+
+
 //=============================================================================
 /*!
  *   constructor:

diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
index 5791ebce9fa318dddbbeaf77591cfd60aff9e006..8955f32cb1fa0d52e7fa86aca40880ce43cddabd 100644 (file)
--- 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<Handle(GEOM_Object)> theEdgesAndWires);
+  Standard_EXPORT Handle(GEOM_Object) MakeWire (std::list<Handle(GEOM_Object)> theEdgesAndWires);
 
   Standard_EXPORT Handle(GEOM_Object) MakeFace (Handle(GEOM_Object) theWire, const bool isPlanarWanted);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (list<Handle(GEOM_Object)> theWires,
+  Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (std::list<Handle(GEOM_Object)> theWires,
                                      const bool isPlanarWanted);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeShell (list<Handle(GEOM_Object)> theShapes);
+  Standard_EXPORT Handle(GEOM_Object) MakeShell (std::list<Handle(GEOM_Object)> theShapes);
 
   Standard_EXPORT Handle(GEOM_Object) MakeSolidShell (Handle(GEOM_Object) theShell);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (list<Handle(GEOM_Object)> theShells);
+  Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (std::list<Handle(GEOM_Object)> theShells);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeCompound (list<Handle(GEOM_Object)> theShapes);
+  Standard_EXPORT Handle(GEOM_Object) MakeCompound (std::list<Handle(GEOM_Object)> 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<Handle(GEOM_Object)> theFaces,
+                                                          std::list<Handle(GEOM_Object)> 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<Handle(GEOM_Object)>      theShapes,
+  Handle(GEOM_Object) MakeShape (std::list<Handle(GEOM_Object)>      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 8b1aa51c8d683c767f2a43f877298fae66db6399..0c440ceeb5dc46c482c7b9deb5fa21e6cc94b7e9 100644 (file)
--- 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 f8a1d2a206f7b6ec412e5c2bbd6174792f12369e..57e9e876971c44ad538c062b34448afbc40fed4d 100644 (file)
--- a/src/GEOM_I/GEOM_IBlocksOperations_i.cc
+++ b/src/GEOM_I/GEOM_IBlocksOperations_i.cc
@@ -31,6 +31,8 @@
 #include <TColStd_HSequenceOfTransient.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *   constructor:

diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.cc b/src/GEOM_I/GEOM_ICurvesOperations_i.cc
index 7762d6192e4c3133ed4729e0545e5079acc0682f..7a97741a87601938829e5d8c39f4a1ef7a966645 100644 (file)
--- 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 cdd3f1efec13f02368601a86dfef46afbaa98045..139af611ea5eddb611634f2e1e17d7c94ea42756 100644 (file)
--- a/src/GEOM_I/GEOM_IHealingOperations_i.cc
+++ b/src/GEOM_I/GEOM_IHealingOperations_i.cc
@@ -31,6 +31,8 @@
 
 #include <TColStd_HSequenceOfTransient.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *   constructor:

diff --git a/src/GEOM_I/GEOM_ILocalOperations_i.cc b/src/GEOM_I/GEOM_ILocalOperations_i.cc
index a9ec1fc6dae486a1f7e085f30232a641bd152da5..98e1c90048199a59d048887d9f81f32dfbbda6ef 100644 (file)
--- 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 a1430f88a15e15a8c4c60313092645854a11de03..da73da5acb2043c03f63e3fea0c397cabd0befb8 100644 (file)
--- a/src/GEOM_I/GEOM_IShapesOperations_i.cc
+++ b/src/GEOM_I/GEOM_IShapesOperations_i.cc
@@ -31,6 +31,8 @@
 #include <TColStd_HSequenceOfTransient.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *   constructor:

diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc
index 4a86443b64649dd578f5123654e9a25b3bff4c23..9d9b084f37e96c3134d10c3f5542a93d270e4601 100644 (file)
--- 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 41109a73210a9b2b977b2eb09590c793e631f38d..c70ed11e97483ff2c4d4a3199994c1ec3e7d9d8f 100644 (file)
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -48,6 +48,8 @@
 #include <TColStd_MapOfInteger.hxx>
 #include <TColStd_DataMapIteratorOfDataMapOfIntegerInteger.hxx>
 
+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 e4a0316509bd816b4bea91e31beedffc23e9818c..1ddaf777d5f44b38b9b90d1ec83bb80fe755ad33 100644 (file)
--- a/src/IGESExport/IGESExport.cxx
+++ b/src/IGESExport/IGESExport.cxx
@@ -31,22 +31,14 @@
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS_Shape.hxx>
 
-#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
 
 //=============================================================================