From f931ebe5b663153f8e276d607d870aa401a91048 Mon Sep 17 00:00:00 2001 From: env Date: Thu, 11 Aug 2005 04:14:22 +0000 Subject: [PATCH] ENV: Windows porting. --- src/GEOMBase/GEOMBase_Skeleton.cxx | 3 +- src/GEOMBase/GEOMBase_aParameterDlg.cxx | 6 ++- src/GEOMClient/GEOM_Client.cxx | 21 +++++--- src/GEOMFiltersSelection/GEOM_EdgeFilter.h | 2 +- src/GEOMFiltersSelection/GEOM_FaceFilter.h | 2 +- src/GEOMFiltersSelection/GEOM_LogicalFilter.h | 3 +- src/GEOMFiltersSelection/GEOM_OCCFilter.h | 6 +-- src/GEOMFiltersSelection/GEOM_PreviewFilter.h | 3 +- .../GEOM_SelectionFilter.h | 2 +- .../GEOM_ShapeTypeFilter.cxx | 3 +- src/GEOMFiltersSelection/GEOM_TypeFilter.h | 2 +- src/GEOMGUI/GEOMGUI_OCCSelector.cxx | 8 +++ src/GEOMGUI/GEOM_Displayer.h | 8 ++- src/GEOMGUI/GeometryGUI.h | 8 ++- src/GEOM_I/GEOM_DumpPython.cc | 6 ++- src/GEOM_I/GEOM_Gen_i.cc | 35 +++++++------ src/GEOM_I/GEOM_Gen_i.hh | 2 +- src/GEOM_I/GEOM_I3DPrimOperations_i.cc | 2 +- src/GEOM_I/GEOM_IBasicOperations_i.cc | 2 +- src/GEOM_I/GEOM_IBlocksOperations_i.cc | 2 +- src/GEOM_I/GEOM_IBlocksOperations_i.hh | 34 ++++++------- src/GEOM_I/GEOM_IBooleanOperations_i.cc | 2 +- src/GEOM_I/GEOM_IBooleanOperations_i.hh | 4 +- src/GEOM_I/GEOM_ICurvesOperations_i.cc | 2 +- src/GEOM_I/GEOM_IGroupOperations_i.cc | 2 +- src/GEOM_I/GEOM_IHealingOperations_i.cc | 3 +- src/GEOM_I/GEOM_IInsertOperations_i.cc | 6 ++- src/GEOM_I/GEOM_ILocalOperations_i.cc | 2 +- src/GEOM_I/GEOM_IMeasureOperations_i.cc | 2 +- src/GEOM_I/GEOM_IOperations_i.cc | 4 +- src/GEOM_I/GEOM_IShapesOperations_i.cc | 2 +- src/GEOM_I/GEOM_IShapesOperations_i.hh | 50 +++++++++---------- src/GEOM_I/GEOM_ITransformOperations_i.cc | 2 +- src/GEOM_I/GEOM_Object_i.cc | 28 +++++++---- 34 files changed, 164 insertions(+), 105 deletions(-) diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx index a1a656ee0..93eeb0a90 100644 --- 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 +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 fc8a07343..75614223b 100644 --- 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 #include +#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 35710a506..208f52e0e 100644 --- a/src/GEOMClient/GEOM_Client.cxx +++ b/src/GEOMClient/GEOM_Client.cxx @@ -26,18 +26,15 @@ // Module : GEOM // $Header$ -#include +#include -using namespace std; +#include #include "GEOM_Client.hxx" #include #include "OpUtil.hxx" #include "utilities.h" -#include CORBA_SERVER_HEADER(SALOMEDS) -#include CORBA_SERVER_HEADER(GEOM_Gen) - #include #include #include @@ -48,7 +45,14 @@ using namespace std; #include #include +#ifdef WNT +#include +#else #include +#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 86e29864a..b91a82fc2 100644 --- 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 febd2ae93..f21592470 100644 --- 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 55e64ef61..139997d61 100644 --- a/src/GEOMFiltersSelection/GEOM_LogicalFilter.h +++ b/src/GEOMFiltersSelection/GEOM_LogicalFilter.h @@ -2,10 +2,11 @@ #define GEOM_LOGICALFILTER_H #include +#include #include -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 70665bd5b..b19764305 100644 --- 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 b10b7481c..b454f330d 100644 --- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.h +++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.h @@ -2,8 +2,9 @@ #define GEOM_PREVIEW_FILTER_H #include +#include -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 b05f053d5..a4a115432 100644 --- a/src/GEOMFiltersSelection/GEOM_SelectionFilter.h +++ b/src/GEOMFiltersSelection/GEOM_SelectionFilter.h @@ -11,7 +11,7 @@ #include #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 9d98cc998..5292daa07 100644 --- a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx @@ -26,7 +26,8 @@ // Module : GEOM // $Header$ -using namespace std; +#include + #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 1f077a2c6..a9fb36deb 100644 --- a/src/GEOMFiltersSelection/GEOM_TypeFilter.h +++ b/src/GEOMFiltersSelection/GEOM_TypeFilter.h @@ -7,7 +7,7 @@ #include #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 c2afc40b9..e9f04b036 100644 --- 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 indexesMap; // "entry - list_of_int" map for LOCAL selection +#else + NCollection_DataMap indexesMap; // "entry - list_of_int" map for LOCAL selection +#endif QMap 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 13a1c65fe..ea2958a01 100644 --- 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 +#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 36d10bbdc..2f56a0029 100644 --- a/src/GEOMGUI/GeometryGUI.h +++ b/src/GEOMGUI/GeometryGUI.h @@ -38,6 +38,12 @@ #include "gp_Ax3.hxx" +#ifdef WNT +#include +#else +#define SALOME_WNT_EXPORT +#endif + typedef QMap 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 0b714de68..6b71e1551 100644 --- 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 #include "GEOM_Gen_i.hh" #include diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index c2fcc2448..bb5a92348 100644 --- 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 + #include "GEOM_Gen_i.hh" #include "GEOM_Object_i.hh" @@ -24,7 +30,6 @@ #include #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 6543545fb..e0b09d6b9 100644 --- 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 fcee420eb..430982489 100644 --- a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc +++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc @@ -1,4 +1,4 @@ -using namespace std; +#include #include "GEOM_I3DPrimOperations_i.hh" diff --git a/src/GEOM_I/GEOM_IBasicOperations_i.cc b/src/GEOM_I/GEOM_IBasicOperations_i.cc index 0cf0e8366..7ad068544 100644 --- a/src/GEOM_I/GEOM_IBasicOperations_i.cc +++ b/src/GEOM_I/GEOM_IBasicOperations_i.cc @@ -1,4 +1,4 @@ -using namespace std; +#include #include "GEOM_IBasicOperations_i.hh" diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.cc b/src/GEOM_I/GEOM_IBlocksOperations_i.cc index 4c1d25cdd..a6965e83b 100644 --- a/src/GEOM_I/GEOM_IBlocksOperations_i.cc +++ b/src/GEOM_I/GEOM_IBlocksOperations_i.cc @@ -1,4 +1,4 @@ -using namespace std; +#include #include "GEOM_IBlocksOperations_i.hh" diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.hh b/src/GEOM_I/GEOM_IBlocksOperations_i.hh index 52d81ffa6..6f7542235 100644 --- 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 4bfaba4af..504a506c5 100644 --- a/src/GEOM_I/GEOM_IBooleanOperations_i.cc +++ b/src/GEOM_I/GEOM_IBooleanOperations_i.cc @@ -1,4 +1,4 @@ -using namespace std; +#include #include "GEOM_IBooleanOperations_i.hh" diff --git a/src/GEOM_I/GEOM_IBooleanOperations_i.hh b/src/GEOM_I/GEOM_IBooleanOperations_i.hh index 48db54c99..1a233c2d7 100644 --- 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 5182be099..d8f185ece 100644 --- a/src/GEOM_I/GEOM_ICurvesOperations_i.cc +++ b/src/GEOM_I/GEOM_ICurvesOperations_i.cc @@ -1,4 +1,4 @@ -using namespace std; +#include #include "GEOM_ICurvesOperations_i.hh" diff --git a/src/GEOM_I/GEOM_IGroupOperations_i.cc b/src/GEOM_I/GEOM_IGroupOperations_i.cc index 3ee63ba84..25ca4a661 100644 --- a/src/GEOM_I/GEOM_IGroupOperations_i.cc +++ b/src/GEOM_I/GEOM_IGroupOperations_i.cc @@ -1,4 +1,4 @@ -using namespace std; +#include #include "GEOM_IGroupOperations_i.hh" diff --git a/src/GEOM_I/GEOM_IHealingOperations_i.cc b/src/GEOM_I/GEOM_IHealingOperations_i.cc index 2190a7eb2..7060b2afd 100644 --- a/src/GEOM_I/GEOM_IHealingOperations_i.cc +++ b/src/GEOM_I/GEOM_IHealingOperations_i.cc @@ -1,5 +1,6 @@ +#include + #include -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 c4e4dc355..1a525dc29 100644 --- 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 #include "GEOM_IInsertOperations_i.hh" diff --git a/src/GEOM_I/GEOM_ILocalOperations_i.cc b/src/GEOM_I/GEOM_ILocalOperations_i.cc index cfd948da1..64737cbf3 100644 --- a/src/GEOM_I/GEOM_ILocalOperations_i.cc +++ b/src/GEOM_I/GEOM_ILocalOperations_i.cc @@ -1,4 +1,4 @@ -using namespace std; +#include #include "GEOM_ILocalOperations_i.hh" diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc index 526f82d39..e57839312 100644 --- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc +++ b/src/GEOM_I/GEOM_IMeasureOperations_i.cc @@ -1,4 +1,4 @@ -using namespace std; +#include #include "GEOM_IMeasureOperations_i.hh" diff --git a/src/GEOM_I/GEOM_IOperations_i.cc b/src/GEOM_I/GEOM_IOperations_i.cc index d93a06133..1c2b53ba3 100644 --- a/src/GEOM_I/GEOM_IOperations_i.cc +++ b/src/GEOM_I/GEOM_IOperations_i.cc @@ -1,4 +1,4 @@ -using namespace std; +#include #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 718f5683f..db4495956 100644 --- a/src/GEOM_I/GEOM_IShapesOperations_i.cc +++ b/src/GEOM_I/GEOM_IShapesOperations_i.cc @@ -1,4 +1,4 @@ -using namespace std; +#include #include "GEOM_IShapesOperations_i.hh" diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.hh b/src/GEOM_I/GEOM_IShapesOperations_i.hh index 0ad390980..295e9d462 100644 --- 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 5365f13ee..a01edea09 100644 --- a/src/GEOM_I/GEOM_ITransformOperations_i.cc +++ b/src/GEOM_I/GEOM_ITransformOperations_i.cc @@ -1,4 +1,4 @@ -using namespace std; +#include #include "GEOM_ITransformOperations_i.hh" diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc index c273d3d11..c67e139c2 100644 --- a/src/GEOM_I/GEOM_Object_i.cc +++ b/src/GEOM_I/GEOM_Object_i.cc @@ -1,24 +1,28 @@ -using namespace std; +#include -#include "GEOM_Object_i.hh" -//#include "GEOM_Gen_i.hh" -#include "GEOM_ISubShape.hxx" -#include "GEOMImpl_Types.hxx" +#include +//#include +#include +#include #include "utilities.h" -#include "OpUtil.hxx" -#include "Utils_ExceptHandlers.hxx" +#include +#include + +#include +#include #include #include #include -#include -#include - #include #include #include +#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); } -- 2.39.2