ENV: Windows porting.

diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx
index a1a656ee0f2b960b196105eb91aa5e6c1d075d20..93eeb0a904e5eead2fadddaad8bca2de2c7df94e 100644 (file)
--- a/src/GEOMBase/GEOMBase_Skeleton.cxx
+++ b/src/GEOMBase/GEOMBase_Skeleton.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "GEOMBase_Skeleton.h"
 #include "GeometryGUI.h"
 
@@ -36,6 +35,8 @@ using namespace std;
 
 #include <qpushbutton.h>
 
+using namespace std;
+
 //=================================================================================
 // class    : GEOMBase_Skeleton()
 // purpose  : Constructs a GEOMBase_Skeleton which is a child of 'parent', with the 

diff --git a/src/GEOMBase/GEOMBase_aParameterDlg.cxx b/src/GEOMBase/GEOMBase_aParameterDlg.cxx
index fc8a073432476a38124b1b0c232a7ebdbaf49007..75614223b9c0866489d26e91d2ed6748d7d67d2c 100644 (file)
--- a/src/GEOMBase/GEOMBase_aParameterDlg.cxx
+++ b/src/GEOMBase/GEOMBase_aParameterDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "GEOMBase_aParameterDlg.h"
 #include "QtxDblSpinBox.h"
 
@@ -39,6 +38,11 @@ using namespace std;
 #include <qvariant.h>
 #include <qvalidator.h>
 
+#ifndef WNT
+using namespace std;
+#endif
+
+
 //====================================================================================== 
 // function : GEOMBase_aParameterDlg()
 // purpose  : Constructs a GEOMBase_aParametertDlg which is a child of 'parent', with the 

diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx
index 35710a5062d1a402046a3c8c6af6b1f7d81212a6..208f52e0eb08251f1375ac7cda09da63359b7854 100644 (file)
--- a/src/GEOMClient/GEOM_Client.cxx
+++ b/src/GEOMClient/GEOM_Client.cxx
@@ -26,18 +26,15 @@
 //  Module : GEOM
 //  $Header$
 
-#include <strstream>
+#include <Standard_Stream.hxx>
 
-using namespace std;
+#include <strstream>
 
 #include "GEOM_Client.hxx"
 #include <SALOMEconfig.h>
 #include "OpUtil.hxx"
 #include "utilities.h"
 
-#include CORBA_SERVER_HEADER(SALOMEDS)
-#include CORBA_SERVER_HEADER(GEOM_Gen)
-
 #include <BRep_Builder.hxx>
 #include <BRepTools.hxx>
 #include <TopoDS_Shape.hxx>
@@ -48,7 +45,14 @@ using namespace std;
 #include <TopAbs.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
+#ifdef WNT
+#include <process.h>
+#else
 #include <unistd.h>
+#endif
+
+#include CORBA_SERVER_HEADER(SALOMEDS)
+#include CORBA_SERVER_HEADER(GEOM_Gen)
 
 #define HST_CLIENT_LEN 256
 
@@ -89,7 +93,12 @@ TopoDS_Shape GEOM_Client::Load( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr a
 //=======================================================================
 GEOM_Client::GEOM_Client()
 {
-  pid_client = (long)getpid();
+  pid_client = 
+#ifdef WNT
+    (long)_getpid();
+#else
+    (long)getpid();
+#endif
 }
 
 //=======================================================================

diff --git a/src/GEOMFiltersSelection/GEOM_EdgeFilter.h b/src/GEOMFiltersSelection/GEOM_EdgeFilter.h
index 86e29864a8d5bc09329d9f672e9d5564d78d2a1e..b91a82fc282caf54bb9671300b3619f079699dd7 100644 (file)
--- a/src/GEOMFiltersSelection/GEOM_EdgeFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_EdgeFilter.h
@@ -3,7 +3,7 @@
 
 #include "GEOM_SelectionFilter.h"
 
-class GEOM_EdgeFilter : public GEOM_SelectionFilter
+class Standard_EXPORT GEOM_EdgeFilter : public GEOM_SelectionFilter
 {
 public:
   GEOM_EdgeFilter( SalomeApp_Study* study, const int kind );

diff --git a/src/GEOMFiltersSelection/GEOM_FaceFilter.h b/src/GEOMFiltersSelection/GEOM_FaceFilter.h
index febd2ae93cb6ad8ec16013e4cbff12d008248525..f21592470d305db5019599b8e0962db10a98846b 100644 (file)
--- a/src/GEOMFiltersSelection/GEOM_FaceFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_FaceFilter.h
@@ -3,7 +3,7 @@
 
 #include "GEOM_SelectionFilter.h"
 
-class GEOM_FaceFilter : public GEOM_SelectionFilter
+class Standard_EXPORT GEOM_FaceFilter : public GEOM_SelectionFilter
 {
 public:
   GEOM_FaceFilter( SalomeApp_Study* study, const int kind );

diff --git a/src/GEOMFiltersSelection/GEOM_LogicalFilter.h b/src/GEOMFiltersSelection/GEOM_LogicalFilter.h
index 55e64ef618f2650ad69cf87c7ae9f140a8483811..139997d61db0952c89e1f88029667065b243b257 100644 (file)
--- a/src/GEOMFiltersSelection/GEOM_LogicalFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_LogicalFilter.h
@@ -2,10 +2,11 @@
 #define GEOM_LOGICALFILTER_H
 
 #include <SUIT_SelectionFilter.h>
+#include <Standard_Macro.hxx>
 
 #include <qptrlist.h>
 
-class GEOM_LogicalFilter : public SUIT_SelectionFilter
+class Standard_EXPORT GEOM_LogicalFilter : public SUIT_SelectionFilter
 {
 public:
   enum { LO_OR, LO_AND, LO_NOT, LO_UNDEFINED };

diff --git a/src/GEOMFiltersSelection/GEOM_OCCFilter.h b/src/GEOMFiltersSelection/GEOM_OCCFilter.h
index 70665bd5be7adbb252312f9b93ee2d54f310791c..b19764305618d506d3ae2825cc575045eb2c3e8b 100644 (file)
--- a/src/GEOMFiltersSelection/GEOM_OCCFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.h
@@ -10,10 +10,10 @@ class SalomeApp_SelectionMgr;
 class GEOM_OCCFilter : public SelectMgr_Filter
 {
 public:
-  GEOM_OCCFilter( SalomeApp_SelectionMgr* theSelMgr);
-  ~GEOM_OCCFilter();
+  Standard_EXPORT GEOM_OCCFilter( SalomeApp_SelectionMgr* theSelMgr);
+  Standard_EXPORT ~GEOM_OCCFilter();
   
-  virtual Standard_Boolean IsOk( const Handle(SelectMgr_EntityOwner)& anObj ) const;
+  Standard_EXPORT virtual Standard_Boolean IsOk( const Handle(SelectMgr_EntityOwner)& anObj ) const;
     
 private:
   SalomeApp_SelectionMgr* mySelMgr;

diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.h b/src/GEOMFiltersSelection/GEOM_PreviewFilter.h
index b10b7481c503b2fa1e4f18d5eaea9488462a7fe3..b454f330d746f8812b6b3dfba3198528793e0b32 100644 (file)
--- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.h
@@ -2,8 +2,9 @@
 #define GEOM_PREVIEW_FILTER_H
 
 #include <SalomeApp_Filter.h>
+#include <Standard_Macro.hxx>
 
-class GEOM_PreviewFilter : public SalomeApp_Filter
+class Standard_EXPORT GEOM_PreviewFilter : public SalomeApp_Filter
 {
 public:
   GEOM_PreviewFilter( SalomeApp_Study* study );

diff --git a/src/GEOMFiltersSelection/GEOM_SelectionFilter.h b/src/GEOMFiltersSelection/GEOM_SelectionFilter.h
index b05f053d52c7670cd46c3b22a6b4dbeb1bdef982..a4a1154323e63708e378ac66112f4e81349b1c13 100644 (file)
--- a/src/GEOMFiltersSelection/GEOM_SelectionFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_SelectionFilter.h
@@ -11,7 +11,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 
-class GEOM_SelectionFilter : public SalomeApp_Filter
+class Standard_EXPORT GEOM_SelectionFilter : public SalomeApp_Filter
 {
 public:
   GEOM_SelectionFilter( SalomeApp_Study* study, const bool theAll = false );

diff --git a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx
index 9d98cc99875f48327a67120c17d1bc0931cfb861..5292daa070cc222639abcb5a0314cf605e40d9bb 100644 (file)
--- a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx
@@ -26,7 +26,8 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
+#include <Standard_Stream.hxx>
+
 #include "GEOM_ShapeTypeFilter.ixx"
 #include "SALOME_InteractiveObject.hxx"
 #include "GEOM_Client.hxx"

diff --git a/src/GEOMFiltersSelection/GEOM_TypeFilter.h b/src/GEOMFiltersSelection/GEOM_TypeFilter.h
index 1f077a2c670040806baad7c93e3b2d246c57c961..a9fb36deb15bb14b60bf69b49f6a94070de9ce93 100644 (file)
--- a/src/GEOMFiltersSelection/GEOM_TypeFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_TypeFilter.h
@@ -7,7 +7,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 
-class GEOM_TypeFilter : public GEOM_SelectionFilter
+class Standard_EXPORT GEOM_TypeFilter : public GEOM_SelectionFilter
 {
 public:
   GEOM_TypeFilter(SalomeApp_Study* study, const int type, const bool isShapeType = false );

diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx
index c2afc40b993f84b9079c2a194a3834a4fcf6bf2f..e9f04b03614c56fa1f96609e2b04bb5b3d1fb5da 100644 (file)
--- a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx
+++ b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx
@@ -153,7 +153,11 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
 
   Handle(AIS_InteractiveContext) ic = vw->getAISContext();
 
+#ifndef WNT
   NCollection_DataMap<TCollection_AsciiString, TColStd_IndexedMapOfInteger> indexesMap; // "entry - list_of_int" map for LOCAL selection
+#else
+  NCollection_DataMap<Standard_CString, TColStd_IndexedMapOfInteger> indexesMap; // "entry - list_of_int" map for LOCAL selection
+#endif
   QMap<QString,int> globalSelMap; // only Key=entry from this map is used.  value(int) is NOT used at all.
   SelectMgr_IndexedMapOfOwner ownersmap; // map of owners to be selected
   
@@ -168,7 +172,11 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
     if ( subOwner )
     {
       QString entry = subOwner->entry();
+#ifndef WNT
       if ( indexesMap.IsBound( TCollection_AsciiString((char*)entry.latin1())))
+#else
+         if ( indexesMap.IsBound( (char*)entry.latin1()))
+#endif
       {
        TColStd_IndexedMapOfInteger& subIndexes = indexesMap.ChangeFind((char*)entry.latin1());
        subIndexes.Add( subOwner->index() );

diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h
index 13a1c65fe156852f6cff24dcb0520a9712188d12..ea2958a01072ad51788b747be0d5064336746a6c 100644 (file)
--- a/src/GEOMGUI/GEOM_Displayer.h
+++ b/src/GEOMGUI/GEOM_Displayer.h
@@ -53,7 +53,13 @@ class SalomeApp_Study;
 class SUIT_SelectionFilter;
 //class SALOME_Selection;
 
-class GEOM_Displayer : public SALOME_Displayer
+#ifdef WNT
+#include <SALOME_WNT.hxx>
+#else
+#define SALOME_WNT_EXPORT
+#endif
+
+class SALOME_WNT_EXPORT GEOM_Displayer : public SALOME_Displayer
 {
     
 public:

diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h
index 36d10bbdcd1c97b882b8bc476e56cd2e17b310b1..2f56a0029bc5a9c4fb175162163007a01ae1e85f 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.h
+++ b/src/GEOMGUI/GeometryGUI.h
@@ -38,6 +38,12 @@
 
 #include "gp_Ax3.hxx"
 
+#ifdef WNT
+#include <SALOME_WNT.hxx>
+#else
+#define SALOME_WNT_EXPORT
+#endif
+
 typedef QMap<QString, GEOMGUI*> GUIMap;
 
 class QDialog;
@@ -51,7 +57,7 @@ class SUIT_ViewManager;
 // class    : GeometryGUI
 // purpose  :
 //=================================================================================
-class GeometryGUI : public SalomeApp_Module
+class SALOME_WNT_EXPORT GeometryGUI : public SalomeApp_Module
 {
   Q_OBJECT;
 

diff --git a/src/GEOM_I/GEOM_DumpPython.cc b/src/GEOM_I/GEOM_DumpPython.cc
index 0b714de688318cf5c391f69c039bcfabbce40556..6b71e1551be95042c69ae183b21f716eb7aca6a7 100644 (file)
--- a/src/GEOM_I/GEOM_DumpPython.cc
+++ b/src/GEOM_I/GEOM_DumpPython.cc
@@ -1,4 +1,8 @@
-using namespace std;
+#ifdef WNT
+#pragma warning( disable:4786 )
+#endif
+
+#include <Standard_Stream.hxx>
 
 #include "GEOM_Gen_i.hh"
 #include <TCollection_AsciiString.hxx>

diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc
index c2fcc2448d4acf54cdbcca5a042fcee6d2594f38..bb5a92348790d7e19887f155905b893c3c1ad9a6 100644 (file)
--- a/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@ -1,3 +1,9 @@
+#ifdef WNT
+#pragma warning( disable:4786 )
+#endif
+
+#include <Standard_Stream.hxx>
+
 #include "GEOM_Gen_i.hh"
 #include "GEOM_Object_i.hh"
 
@@ -24,7 +30,6 @@
 #include <TopAbs_ShapeEnum.hxx>
 
 #include "SALOMEDS_Tool.hxx"
-using namespace std;
 
 //============================================================================
 // function : GEOM_Gen_i()
@@ -493,7 +498,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::AddInStudy(SALOMEDS::Study_ptr theStudy, GEOM:
 //============================================================================
 void GEOM_Gen_i::register_name(char * name)
 {
-  GEOM::GEOM_Gen_ptr g = GEOM::GEOM_Gen::_narrow(POA_GEOM::GEOM_Gen::_this());
+  GEOM::GEOM_Gen_ptr g = GEOM::GEOM_Gen::_narrow(_this());
   name_service->Register(g, strdup(name)); 
 }
 
@@ -525,7 +530,7 @@ GEOM::GEOM_IBasicOperations_ptr GEOM_Gen_i::GetIBasicOperations(CORBA::Long theS
   Unexpect aCatch(SALOME_SalomeException);
   MESSAGE( "GEOM_Gen_i::GetIBasicOperations" );
 
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); 
+  GEOM::GEOM_Gen_ptr engine = _this(); 
 
   GEOM_IBasicOperations_i* aServant =
     new GEOM_IBasicOperations_i(_poa, engine, _impl->GetIBasicOperations(theStudyID));
@@ -545,7 +550,7 @@ GEOM::GEOM_ITransformOperations_ptr GEOM_Gen_i::GetITransformOperations(CORBA::L
   Unexpect aCatch(SALOME_SalomeException);
   MESSAGE( "GEOM_Gen_i::GetITransformOperations" );
 
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); 
+  GEOM::GEOM_Gen_ptr engine = _this(); 
 
   GEOM_ITransformOperations_i* aServant =
     new GEOM_ITransformOperations_i(_poa, engine, _impl->GetITransformOperations(theStudyID));
@@ -565,7 +570,7 @@ GEOM::GEOM_I3DPrimOperations_ptr GEOM_Gen_i::GetI3DPrimOperations(CORBA::Long th
   Unexpect aCatch(SALOME_SalomeException);
   MESSAGE( "GEOM_Gen_i::GetI3DPrimOperations" );
 
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); 
+  GEOM::GEOM_Gen_ptr engine = _this(); 
 
   GEOM_I3DPrimOperations_i* aServant =
     new GEOM_I3DPrimOperations_i(_poa, engine, _impl->GetI3DPrimOperations(theStudyID));
@@ -585,7 +590,7 @@ GEOM::GEOM_IShapesOperations_ptr GEOM_Gen_i::GetIShapesOperations(CORBA::Long th
   Unexpect aCatch(SALOME_SalomeException);
   MESSAGE( "GEOM_Gen_i::GetIShapesOperations" );
 
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); 
+  GEOM::GEOM_Gen_ptr engine = _this(); 
 
   GEOM_IShapesOperations_i* aServant =
     new GEOM_IShapesOperations_i(_poa, engine, _impl->GetIShapesOperations(theStudyID));
@@ -605,7 +610,7 @@ GEOM::GEOM_IBlocksOperations_ptr GEOM_Gen_i::GetIBlocksOperations(CORBA::Long th
   Unexpect aCatch(SALOME_SalomeException);
   MESSAGE( "GEOM_Gen_i::GetIBlocksOperations" );
 
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); 
+  GEOM::GEOM_Gen_ptr engine = _this(); 
 
   GEOM_IBlocksOperations_i* aServant =
     new GEOM_IBlocksOperations_i(_poa, engine, _impl->GetIBlocksOperations(theStudyID));
@@ -625,7 +630,7 @@ GEOM::GEOM_IBooleanOperations_ptr GEOM_Gen_i::GetIBooleanOperations(CORBA::Long
   Unexpect aCatch(SALOME_SalomeException);
   MESSAGE( "GEOM_Gen_i::GetIBooleanOperations" );
 
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); 
+  GEOM::GEOM_Gen_ptr engine = _this(); 
 
   GEOM_IBooleanOperations_i* aServant =
     new GEOM_IBooleanOperations_i(_poa, engine, _impl->GetIBooleanOperations(theStudyID));
@@ -645,7 +650,7 @@ GEOM::GEOM_ICurvesOperations_ptr GEOM_Gen_i::GetICurvesOperations(CORBA::Long th
   Unexpect aCatch(SALOME_SalomeException);
   MESSAGE( "GEOM_Gen_i::GetICurvesOperations" );
 
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); 
+  GEOM::GEOM_Gen_ptr engine = _this(); 
 
   GEOM_ICurvesOperations_i* aServant =
     new GEOM_ICurvesOperations_i(_poa, engine, _impl->GetICurvesOperations(theStudyID));
@@ -665,7 +670,7 @@ GEOM::GEOM_ILocalOperations_ptr GEOM_Gen_i::GetILocalOperations(CORBA::Long theS
   Unexpect aCatch(SALOME_SalomeException);
   MESSAGE( "GEOM_Gen_i::GetILocalOperations" );
 
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); 
+  GEOM::GEOM_Gen_ptr engine = _this(); 
 
   GEOM_ILocalOperations_i* aServant =
     new GEOM_ILocalOperations_i(_poa, engine, _impl->GetILocalOperations(theStudyID));
@@ -685,7 +690,7 @@ GEOM::GEOM_IHealingOperations_ptr GEOM_Gen_i::GetIHealingOperations(CORBA::Long
   Unexpect aCatch(SALOME_SalomeException);
   MESSAGE( "GEOM_Gen_i::IHealingOperations" );
 
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); 
+  GEOM::GEOM_Gen_ptr engine = _this(); 
 
   GEOM_IHealingOperations_i* aServant =
     new GEOM_IHealingOperations_i(_poa, engine, _impl->GetIHealingOperations(theStudyID));
@@ -705,7 +710,7 @@ GEOM::GEOM_IInsertOperations_ptr GEOM_Gen_i::GetIInsertOperations(CORBA::Long th
   Unexpect aCatch(SALOME_SalomeException);
   MESSAGE( "GEOM_Gen_i::GetIInsertOperations" );
 
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); 
+  GEOM::GEOM_Gen_ptr engine = _this(); 
 
   GEOM_IInsertOperations_i* aServant =
     new GEOM_IInsertOperations_i(_poa, engine, _impl->GetIInsertOperations(theStudyID));
@@ -725,7 +730,7 @@ GEOM::GEOM_IMeasureOperations_ptr GEOM_Gen_i::GetIMeasureOperations(CORBA::Long
   Unexpect aCatch(SALOME_SalomeException);
   MESSAGE( "GEOM_Gen_i::GetIMeasureOperations" );
 
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); 
+  GEOM::GEOM_Gen_ptr engine = _this(); 
 
   GEOM_IMeasureOperations_i* aServant =
     new GEOM_IMeasureOperations_i(_poa, engine, _impl->GetIMeasureOperations(theStudyID));
@@ -745,7 +750,7 @@ GEOM::GEOM_IGroupOperations_ptr GEOM_Gen_i::GetIGroupOperations(CORBA::Long theS
   Unexpect aCatch(SALOME_SalomeException);
   MESSAGE( "GEOM_Gen_i::GetIGroupOperations" );
 
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); 
+  GEOM::GEOM_Gen_ptr engine = _this(); 
 
   GEOM_IGroupOperations_i* aServant =
     new GEOM_IGroupOperations_i(_poa, engine, _impl->GetIGroupOperations(theStudyID));
@@ -831,7 +836,7 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::GetObject(CORBA::Long theStudyID, const char*
     return obj._retn();  
    }
 
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); 
+  GEOM::GEOM_Gen_ptr engine = _this(); 
   GEOM_Object_i* servant = new GEOM_Object_i(_poa, engine, handle_object);
   
   obj = servant->_this();

diff --git a/src/GEOM_I/GEOM_Gen_i.hh b/src/GEOM_I/GEOM_Gen_i.hh
index 6543545fbb5301fdabe2893cd3c56c616264a7a9..e0b09d6b9e83453b5f3ad8e6198a12405288427e 100644 (file)
--- a/src/GEOM_I/GEOM_Gen_i.hh
+++ b/src/GEOM_I/GEOM_Gen_i.hh
@@ -33,7 +33,7 @@
 //=====================================================================
 // GEOM_Gen_i : class definition
 //=====================================================================
-class GEOM_Gen_i: public POA_GEOM::GEOM_Gen, public Engines_Component_i
+class GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual public Engines_Component_i
 {
  public:
 

diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc
index fcee420ebcd2b2d10f4ec8cf9264c4b737f39a89..4309824890a30d3a8d1146b40deca6e9fdadd1be 100644 (file)
--- a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc
+++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc
@@ -1,4 +1,4 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
 #include "GEOM_I3DPrimOperations_i.hh"
 

diff --git a/src/GEOM_I/GEOM_IBasicOperations_i.cc b/src/GEOM_I/GEOM_IBasicOperations_i.cc
index 0cf0e8366bca9ae22fe1034bd286ebcc9eb112c0..7ad068544581e479fe3cbca8fc271ec3ee305381 100644 (file)
--- a/src/GEOM_I/GEOM_IBasicOperations_i.cc
+++ b/src/GEOM_I/GEOM_IBasicOperations_i.cc
@@ -1,4 +1,4 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
 #include "GEOM_IBasicOperations_i.hh"
 

diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.cc b/src/GEOM_I/GEOM_IBlocksOperations_i.cc
index 4c1d25cdd40824d2d0275cea0432319ed40f2967..a6965e83b3e2b5e870b0b08e9d0ee55ae3c29af7 100644 (file)
--- a/src/GEOM_I/GEOM_IBlocksOperations_i.cc
+++ b/src/GEOM_I/GEOM_IBlocksOperations_i.cc
@@ -1,4 +1,4 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
 #include "GEOM_IBlocksOperations_i.hh"
 

diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.hh b/src/GEOM_I/GEOM_IBlocksOperations_i.hh
index 52d81ffa6ae8132c3f06d339b129a37d773436fa..6f7542235b13df9cb62f9d73fcde83f079ed8bb2 100644 (file)
--- a/src/GEOM_I/GEOM_IBlocksOperations_i.hh
+++ b/src/GEOM_I/GEOM_IBlocksOperations_i.hh
@@ -48,10 +48,10 @@ class GEOM_IBlocksOperations_i :
 
   // Extract elements of blocks and blocks compounds
   GEOM::GEOM_Object_ptr GetPoint (GEOM::GEOM_Object_ptr theShape,
-                                 const CORBA::Double   theX,
-                                 const CORBA::Double   theY,
-                                 const CORBA::Double   theZ,
-                                 const CORBA::Double   theEpsilon);
+                                 CORBA::Double   theX,
+                                 CORBA::Double   theY,
+                                 CORBA::Double   theZ,
+                                 CORBA::Double   theEpsilon);
 
   GEOM::GEOM_Object_ptr GetEdge (GEOM::GEOM_Object_ptr theShape,
                                 GEOM::GEOM_Object_ptr thePoint1,
@@ -81,8 +81,8 @@ class GEOM_IBlocksOperations_i :
 
   // Check blocks compound
   CORBA::Boolean IsCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
-                                    const CORBA::Long     theMinNbFaces,
-                                    const CORBA::Long     theMaxNbFaces,
+                                    CORBA::Long     theMinNbFaces,
+                                    CORBA::Long     theMaxNbFaces,
                                     CORBA::Long&          theNbBlocks);
 
   CORBA::Boolean CheckCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
@@ -97,8 +97,8 @@ class GEOM_IBlocksOperations_i :
 
   // Extract blocks from blocks compounds
   GEOM::ListOfGO* ExplodeCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
-                                          const CORBA::Long     theMinNbFaces,
-                                          const CORBA::Long     theMaxNbFaces);
+                                          CORBA::Long     theMinNbFaces,
+                                          CORBA::Long     theMaxNbFaces);
 
   GEOM::GEOM_Object_ptr GetBlockNearPoint (GEOM::GEOM_Object_ptr theCompound,
                                           GEOM::GEOM_Object_ptr thePoint);
@@ -111,17 +111,17 @@ class GEOM_IBlocksOperations_i :
 
   // Operations on blocks with gluing of result
   GEOM::GEOM_Object_ptr MakeMultiTransformation1D (GEOM::GEOM_Object_ptr theBlock,
-                                                  const CORBA::Long     theDirFace1,
-                                                  const CORBA::Long     theDirFace2,
-                                                  const CORBA::Long     theNbTimes);
+                                                  CORBA::Long     theDirFace1,
+                                                  CORBA::Long     theDirFace2,
+                                                  CORBA::Long     theNbTimes);
 
   GEOM::GEOM_Object_ptr MakeMultiTransformation2D (GEOM::GEOM_Object_ptr theBlock,
-                                                  const CORBA::Long     theDirFace1U,
-                                                  const CORBA::Long     theDirFace2U,
-                                                  const CORBA::Long     theNbTimesU,
-                                                  const CORBA::Long     theDirFace1V,
-                                                  const CORBA::Long     theDirFace2V,
-                                                  const CORBA::Long     theNbTimesV);
+                                                  CORBA::Long     theDirFace1U,
+                                                  CORBA::Long     theDirFace2U,
+                                                  CORBA::Long     theNbTimesU,
+                                                  CORBA::Long     theDirFace1V,
+                                                  CORBA::Long     theDirFace2V,
+                                                  CORBA::Long     theNbTimesV);
 
   // Build groups for Propagation of 1D hypotheses
   GEOM::ListOfGO* Propagate (GEOM::GEOM_Object_ptr theShape);

diff --git a/src/GEOM_I/GEOM_IBooleanOperations_i.cc b/src/GEOM_I/GEOM_IBooleanOperations_i.cc
index 4bfaba4af634986ca32e3beb7a79017effd8bcaa..504a506c55ac0f61e14e528fb974a47be11c6434 100644 (file)
--- a/src/GEOM_I/GEOM_IBooleanOperations_i.cc
+++ b/src/GEOM_I/GEOM_IBooleanOperations_i.cc
@@ -1,4 +1,4 @@
-using namespace std; 
+#include <Standard_Stream.hxx>
 
 #include "GEOM_IBooleanOperations_i.hh"
 

diff --git a/src/GEOM_I/GEOM_IBooleanOperations_i.hh b/src/GEOM_I/GEOM_IBooleanOperations_i.hh
index 48db54c997e2c15ccb45a9e877c89344dc7ca620..1a233c2d7322b16b733ee4a2791d8b4bdfa2776b 100644 (file)
--- a/src/GEOM_I/GEOM_IBooleanOperations_i.hh
+++ b/src/GEOM_I/GEOM_IBooleanOperations_i.hh
@@ -28,8 +28,8 @@ class GEOM_IBooleanOperations_i :
                                       const GEOM::ListOfGO&   theTools,
                                       const GEOM::ListOfGO&   theKeepInside,
                                       const GEOM::ListOfGO&   theRemoveInside,
-                                      const CORBA::Short      theLimit,
-                                      const CORBA::Boolean    theRemoveWebs,
+                                      CORBA::Short      theLimit,
+                                      CORBA::Boolean    theRemoveWebs,
                                       const GEOM::ListOfLong& theMaterials);
 
 

diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.cc b/src/GEOM_I/GEOM_ICurvesOperations_i.cc
index 5182be099aa6b5c3d58d2711b4f787e4a73a15f6..d8f185eceac594f9e0ee57a2935d2feba505b222 100644 (file)
--- a/src/GEOM_I/GEOM_ICurvesOperations_i.cc
+++ b/src/GEOM_I/GEOM_ICurvesOperations_i.cc
@@ -1,4 +1,4 @@
-using namespace std; 
+#include <Standard_Stream.hxx>
 
 #include "GEOM_ICurvesOperations_i.hh"
 

diff --git a/src/GEOM_I/GEOM_IGroupOperations_i.cc b/src/GEOM_I/GEOM_IGroupOperations_i.cc
index 3ee63ba8403898d0e35f2be2fdc0c9959f52a825..25ca4a6616f59c281531f05a4d9ccdd29c5a8164 100644 (file)
--- a/src/GEOM_I/GEOM_IGroupOperations_i.cc
+++ b/src/GEOM_I/GEOM_IGroupOperations_i.cc
@@ -1,4 +1,4 @@
-using namespace std; 
+#include <Standard_Stream.hxx>
 
 #include "GEOM_IGroupOperations_i.hh"
 

diff --git a/src/GEOM_I/GEOM_IHealingOperations_i.cc b/src/GEOM_I/GEOM_IHealingOperations_i.cc
index 2190a7eb205e89d47931bc412ddfdc8e1b66ff12..7060b2afd8b7da4d24b3027ac41a51d9699b5611 100644 (file)
--- a/src/GEOM_I/GEOM_IHealingOperations_i.cc
+++ b/src/GEOM_I/GEOM_IHealingOperations_i.cc
@@ -1,5 +1,6 @@
+#include <Standard_Stream.hxx>
+
 #include <list>
-using namespace std;
 
 #include "GEOM_IHealingOperations_i.hh"
 #include "GEOM_Engine.hxx"

diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.cc b/src/GEOM_I/GEOM_IInsertOperations_i.cc
index c4e4dc355ce9a175e9a0a10ecbee8797e8d3a77e..1a525dc291458ea1c901dc8b98f4d6ed59f7544a 100644 (file)
--- a/src/GEOM_I/GEOM_IInsertOperations_i.cc
+++ b/src/GEOM_I/GEOM_IInsertOperations_i.cc
@@ -1,4 +1,8 @@
-using namespace std; 
+#ifdef WNT
+#pragma warning( disable:4786 )
+#endif
+
+#include <Standard_Stream.hxx>
 
 #include "GEOM_IInsertOperations_i.hh"
 

diff --git a/src/GEOM_I/GEOM_ILocalOperations_i.cc b/src/GEOM_I/GEOM_ILocalOperations_i.cc
index cfd948da190153a5ec622d6610ee3d50b9f4b78e..64737cbf36b8590647b6d92a39384a47c84c3502 100644 (file)
--- a/src/GEOM_I/GEOM_ILocalOperations_i.cc
+++ b/src/GEOM_I/GEOM_ILocalOperations_i.cc
@@ -1,4 +1,4 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
 #include "GEOM_ILocalOperations_i.hh"
 

diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc
index 526f82d3913b126da6aa8512ee44667a0706a18a..e57839312c751de5f54b2af514654c30ae6bed6f 100644 (file)
--- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc
+++ b/src/GEOM_I/GEOM_IMeasureOperations_i.cc
@@ -1,4 +1,4 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
 #include "GEOM_IMeasureOperations_i.hh"
 

diff --git a/src/GEOM_I/GEOM_IOperations_i.cc b/src/GEOM_I/GEOM_IOperations_i.cc
index d93a06133dba6adc07b7edc94a96ea87a425d074..1c2b53ba3d491c59bf2763b361497207cb8e7e1d 100644 (file)
--- a/src/GEOM_I/GEOM_IOperations_i.cc
+++ b/src/GEOM_I/GEOM_IOperations_i.cc
@@ -1,4 +1,4 @@
-using namespace std; 
+#include <Standard_Stream.hxx>
 
 #include "GEOM_IOperations_i.hh"
 
@@ -20,7 +20,9 @@ using namespace std;
 //=============================================================================
 
 GEOM_IOperations_i::GEOM_IOperations_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, ::GEOM_IOperations* theImpl)
+#ifndef WNT
 :SALOME::GenericObj_i( thePOA ), _impl(theImpl), _engine(theEngine)
+#endif
 {
   thePOA->activate_object(this);
 }

diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.cc b/src/GEOM_I/GEOM_IShapesOperations_i.cc
index 718f5683ffc9259c4fbb06802dac511078d8353a..db449595693736f01b7b73d9ac4063b6346b05f4 100644 (file)
--- a/src/GEOM_I/GEOM_IShapesOperations_i.cc
+++ b/src/GEOM_I/GEOM_IShapesOperations_i.cc
@@ -1,4 +1,4 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
 #include "GEOM_IShapesOperations_i.hh"
 

diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.hh b/src/GEOM_I/GEOM_IShapesOperations_i.hh
index 0ad390980997bb91d7d1e9c788db178cf51f3786..295e9d4627e40dd430961248927989437292344f 100644 (file)
--- a/src/GEOM_I/GEOM_IShapesOperations_i.hh
+++ b/src/GEOM_I/GEOM_IShapesOperations_i.hh
@@ -27,10 +27,10 @@ class GEOM_IShapesOperations_i :
   GEOM::GEOM_Object_ptr MakeWire (const GEOM::ListOfGO& theEdgesAndWires);
 
   GEOM::GEOM_Object_ptr MakeFace (GEOM::GEOM_Object_ptr theWire,
-                                 const CORBA::Boolean  isPlanarWanted);
+                                 CORBA::Boolean  isPlanarWanted);
 
   GEOM::GEOM_Object_ptr MakeFaceWires (const GEOM::ListOfGO& theWires,
-                                      const CORBA::Boolean  isPlanarWanted);
+                                      CORBA::Boolean  isPlanarWanted);
 
   GEOM::GEOM_Object_ptr MakeShell (const GEOM::ListOfGO& theFacesAndShells);
 
@@ -41,18 +41,18 @@ class GEOM_IShapesOperations_i :
   GEOM::GEOM_Object_ptr MakeCompound (const GEOM::ListOfGO& theShapes);
 
   GEOM::GEOM_Object_ptr MakeGlueFaces (GEOM::GEOM_Object_ptr theShape,
-                                      const CORBA::Double   theTolerance);
+                                      CORBA::Double   theTolerance);
 
   GEOM::ListOfGO* MakeExplode (GEOM::GEOM_Object_ptr theShape,
-                              const CORBA::Long     theShapeType,
-                              const CORBA::Boolean  isSorted);
+                              CORBA::Long     theShapeType,
+                              CORBA::Boolean  isSorted);
 
   GEOM::ListOfLong* SubShapeAllIDs (GEOM::GEOM_Object_ptr theShape,
-                                   const CORBA::Long     theShapeType,
-                                   const CORBA::Boolean  isSorted);
+                                   CORBA::Long     theShapeType,
+                                   CORBA::Boolean  isSorted);
 
   GEOM::GEOM_Object_ptr GetSubShape (GEOM::GEOM_Object_ptr theMainShape,
-                                    const CORBA::Long     theID);
+                                    CORBA::Long     theID);
 
   CORBA::Long NumberOfFaces (GEOM::GEOM_Object_ptr theShape);
   CORBA::Long NumberOfEdges (GEOM::GEOM_Object_ptr theShape);
@@ -63,41 +63,41 @@ class GEOM_IShapesOperations_i :
 
   GEOM::ListOfGO* GetSharedShapes (GEOM::GEOM_Object_ptr theShape1,
                                   GEOM::GEOM_Object_ptr theShape2,
-                                  const CORBA::Long     theShapeType);
+                                  CORBA::Long     theShapeType);
 
   GEOM::ListOfGO* GetShapesOnPlane (GEOM::GEOM_Object_ptr   theShape,
-                                   const CORBA::Long       theShapeType,
+                                   CORBA::Long       theShapeType,
                                    GEOM::GEOM_Object_ptr   theAx1,
-                                   const GEOM::shape_state theState);
+                                   GEOM::shape_state theState);
 
   GEOM::ListOfGO* GetShapesOnCylinder (GEOM::GEOM_Object_ptr   theShape,
-                                      const CORBA::Long       theShapeType,
+                                      CORBA::Long       theShapeType,
                                       GEOM::GEOM_Object_ptr   theAxis,
-                                      const CORBA::Double     theRadius,
-                                      const GEOM::shape_state theState);
+                                      CORBA::Double     theRadius,
+                                      GEOM::shape_state theState);
 
   GEOM::ListOfGO* GetShapesOnSphere (GEOM::GEOM_Object_ptr   theShape,
-                                    const CORBA::Long       theShapeType,
+                                    CORBA::Long       theShapeType,
                                     GEOM::GEOM_Object_ptr   theCenter,
-                                    const CORBA::Double     theRadius,
-                                    const GEOM::shape_state theState);
+                                    CORBA::Double     theRadius,
+                                    GEOM::shape_state theState);
 
   GEOM::ListOfLong* GetShapesOnPlaneIDs (GEOM::GEOM_Object_ptr   theShape,
-                                        const CORBA::Long       theShapeType,
+                                        CORBA::Long       theShapeType,
                                         GEOM::GEOM_Object_ptr   theAx1,
-                                        const GEOM::shape_state theState);
+                                        GEOM::shape_state theState);
 
   GEOM::ListOfLong* GetShapesOnCylinderIDs (GEOM::GEOM_Object_ptr   theShape,
-                                           const CORBA::Long       theShapeType,
+                                           CORBA::Long       theShapeType,
                                            GEOM::GEOM_Object_ptr   theAxis,
-                                           const CORBA::Double     theRadius,
-                                           const GEOM::shape_state theState);
+                                           CORBA::Double     theRadius,
+                                           GEOM::shape_state theState);
 
   GEOM::ListOfLong* GetShapesOnSphereIDs (GEOM::GEOM_Object_ptr   theShape,
-                                         const CORBA::Long       theShapeType,
+                                         CORBA::Long       theShapeType,
                                          GEOM::GEOM_Object_ptr   theCenter,
-                                         const CORBA::Double     theRadius,
-                                         const GEOM::shape_state theState);
+                                         CORBA::Double     theRadius,
+                                         GEOM::shape_state theState);
 
   GEOM::GEOM_Object_ptr GetInPlace (GEOM::GEOM_Object_ptr theShapeWhere,
                                    GEOM::GEOM_Object_ptr theShapeWhat);

diff --git a/src/GEOM_I/GEOM_ITransformOperations_i.cc b/src/GEOM_I/GEOM_ITransformOperations_i.cc
index 5365f13eee644bf35ffc9d673f037cd878024666..a01edea0903dab95a509144024abe751c698e512 100644 (file)
--- a/src/GEOM_I/GEOM_ITransformOperations_i.cc
+++ b/src/GEOM_I/GEOM_ITransformOperations_i.cc
@@ -1,4 +1,4 @@
-using namespace std; 
+#include <Standard_Stream.hxx>
 
 #include "GEOM_ITransformOperations_i.hh"
 

diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc
index c273d3d112676713365c48e737e5311760ef8313..c67e139c2c2c35c8202b5728db8b3d3990bd3bc9 100644 (file)
--- a/src/GEOM_I/GEOM_Object_i.cc
+++ b/src/GEOM_I/GEOM_Object_i.cc
@@ -1,24 +1,28 @@
-using namespace std;
+#include <Standard_OStream.hxx>
 
-#include "GEOM_Object_i.hh"
-//#include "GEOM_Gen_i.hh"
-#include "GEOM_ISubShape.hxx"
-#include "GEOMImpl_Types.hxx"
+#include <GEOM_Object_i.hh>
+//#include <GEOM_Gen_i.hh>
+#include <GEOM_ISubShape.hxx>
+#include <GEOMImpl_Types.hxx>
 
 #include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <fstream>
+#include <strstream>
+
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
 #include <TDF_Tool.hxx>
 #include <TDF_Label.hxx>
 #include <TCollection_AsciiString.hxx>
 
-#include <fstream.h>
-#include <strstream>
-
 #include <BRepTools_ShapeSet.hxx>
 #include <BRepTools.hxx>
 #include <TopAbs.hxx>
 
+#ifdef WNT
+#pragma warning( disable:4786 )
+#endif
+
 //=============================================================================
 /*!
  *   constructor:
@@ -27,7 +31,9 @@ using namespace std;
 
 GEOM_Object_i::GEOM_Object_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine,
                              Handle(GEOM_Object) theImpl)
-:SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl)
+#ifndef WNT
+: SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl)
+#endif
 {
   thePOA->activate_object(this);
 }