From ea53bf4f6bfe99ec0fc7724c713e57e1d5141045 Mon Sep 17 00:00:00 2001 From: env Date: Wed, 20 Jul 2005 11:39:13 +0000 Subject: [PATCH] ENV: Windows porting. --- src/HDFPersist/HDFascii.cc | 20 +++++++++++-- src/HDFPersist/HDFascii.hxx | 4 +-- src/HDFPersist/HDFcontainerObject.hxx | 3 +- src/HDFPersist/HDFconvert.cc | 26 +++++++++++++--- src/HDFPersist/HDFconvert.hxx | 3 ++ src/HDFPersist/HDFdataset.hxx | 3 +- src/HDFPersist/HDFfile.cc | 5 ++++ src/HDFPersist/HDFfile.hxx | 3 +- src/HDFPersist/HDFgroup.hxx | 3 +- src/HDFPersist/HDFinternalObject.cc | 2 ++ src/HDFPersist/HDFinternalObject.hxx | 3 +- src/HDFPersist/HDFobject.hxx | 3 +- src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx | 10 +++++++ src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx | 2 ++ .../SALOMEDSImpl_AttributeComment.cxx | 2 ++ .../SALOMEDSImpl_AttributeDrawable.cxx | 2 ++ .../SALOMEDSImpl_AttributeExpandable.cxx | 2 ++ .../SALOMEDSImpl_AttributeFlags.hxx | 4 +++ .../SALOMEDSImpl_AttributeGraphic.hxx | 4 +++ .../SALOMEDSImpl_AttributeIOR.cxx | 2 ++ .../SALOMEDSImpl_AttributeInteger.cxx | 2 ++ .../SALOMEDSImpl_AttributeLocalID.cxx | 4 ++- .../SALOMEDSImpl_AttributeName.cxx | 4 ++- .../SALOMEDSImpl_AttributeOpened.cxx | 4 ++- .../SALOMEDSImpl_AttributePersistentRef.cxx | 4 ++- .../SALOMEDSImpl_AttributePixMap.cxx | 3 +- .../SALOMEDSImpl_AttributePythonObject.cxx | 3 +- .../SALOMEDSImpl_AttributeReal.cxx | 3 +- .../SALOMEDSImpl_AttributeReal.hxx | 2 +- .../SALOMEDSImpl_AttributeReference.cxx | 3 +- .../SALOMEDSImpl_AttributeSelectable.cxx | 3 +- ...ALOMEDSImpl_AttributeSequenceOfInteger.cxx | 3 +- .../SALOMEDSImpl_AttributeSequenceOfReal.cxx | 3 +- .../SALOMEDSImpl_AttributeStudyProperties.cxx | 3 +- .../SALOMEDSImpl_AttributeTableOfInteger.cxx | 2 +- .../SALOMEDSImpl_AttributeTableOfReal.cxx | 3 +- .../SALOMEDSImpl_AttributeTableOfString.cxx | 3 +- .../SALOMEDSImpl_AttributeTarget.cxx | 4 ++- .../SALOMEDSImpl_AttributeTextColor.cxx | 4 ++- ...LOMEDSImpl_AttributeTextHighlightColor.cxx | 4 ++- .../SALOMEDSImpl_AttributeTreeNode.cxx | 4 ++- .../SALOMEDSImpl_AttributeUserID.cxx | 4 ++- .../SALOMEDSImpl_ChildIterator.cxx | 2 +- .../SALOMEDSImpl_GenericAttribute.cxx | 3 +- .../SALOMEDSImpl_OCAFApplication.cxx | 3 +- src/SALOMEDSImpl/SALOMEDSImpl_SComponent.cxx | 4 ++- src/SALOMEDSImpl/SALOMEDSImpl_SComponent.hxx | 2 +- .../SALOMEDSImpl_SComponentIterator.cxx | 4 ++- src/SALOMEDSImpl/SALOMEDSImpl_SObject.cxx | 4 ++- src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx | 4 ++- src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx | 2 +- .../SALOMEDSImpl_StudyBuilder.cxx | 4 ++- .../SALOMEDSImpl_StudyBuilder.hxx | 2 +- src/SALOMEDSImpl/SALOMEDSImpl_StudyHandle.hxx | 30 +++++++++++-------- .../SALOMEDSImpl_StudyManager.cxx | 28 ++++++++++++++--- src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx | 11 +++++-- .../SALOMEDSImpl_UseCaseBuilder.cxx | 4 ++- .../SALOMEDSImpl_UseCaseIterator.cxx | 3 +- src/TOOLSDS/SALOMEDS_Tool.cxx | 10 +++++-- 59 files changed, 227 insertions(+), 71 deletions(-) diff --git a/src/HDFPersist/HDFascii.cc b/src/HDFPersist/HDFascii.cc index e5719df68..186d2bcd0 100644 --- a/src/HDFPersist/HDFascii.cc +++ b/src/HDFPersist/HDFascii.cc @@ -18,6 +18,12 @@ #include #include #include + +#ifdef WNT +#include +#include +#endif + using namespace std; bool CreateAttributeFromASCII(HDFinternalObject *father, FILE* fp); @@ -289,7 +295,11 @@ void SaveDatasetInASCIIfile(HDFdataset *hdf_dataset, FILE* fp, int ident) fprintf(fp, "\n"); +#ifndef WNT for(unsigned j=0; jGetAttributeName(j); HDFattribute *hdf_attribute = new HDFattribute(name, hdf_dataset); delete name; @@ -642,13 +652,19 @@ char* GetTmpDir() TCollection_AsciiString aTmpDir; -#ifdef WIN32 - aTmpDir = TCollection_AsciiString("C:\\"); +#ifdef WNT + char *aTmp; + aTmp = getenv("TMP"); + if(aTmp != NULL) + aTmpDir = TCollection_AsciiString(aTmp); + else + aTmpDir = TCollection_AsciiString("C:\\"); #else aTmpDir = TCollection_AsciiString("/tmp/"); #endif srand((unsigned int)time(NULL)); + int aRND = 999 + (int)(100000.0*rand()/(RAND_MAX+1.0)); //Get a random number to present a name of a sub directory TCollection_AsciiString aSubDir(aRND); if(aSubDir.Length() <= 1) aSubDir = TCollection_AsciiString("123409876"); diff --git a/src/HDFPersist/HDFascii.hxx b/src/HDFPersist/HDFascii.hxx index 5ae7e5846..4ae3f1748 100644 --- a/src/HDFPersist/HDFascii.hxx +++ b/src/HDFPersist/HDFascii.hxx @@ -10,10 +10,10 @@ #ifndef __HDFascii_H__ #define __HDFascii_H__ +#include - -class HDFascii +class Standard_EXPORT HDFascii { public: diff --git a/src/HDFPersist/HDFcontainerObject.hxx b/src/HDFPersist/HDFcontainerObject.hxx index b95bef33c..efc1fd9ed 100644 --- a/src/HDFPersist/HDFcontainerObject.hxx +++ b/src/HDFPersist/HDFcontainerObject.hxx @@ -33,8 +33,9 @@ extern "C" } #include "HDFobject.hxx" #include "HDFinternalObject.hxx" +#include -class HDFcontainerObject : public HDFinternalObject +class Standard_EXPORT HDFcontainerObject : public HDFinternalObject { private : HDFinternalObject *_firstson; diff --git a/src/HDFPersist/HDFconvert.cc b/src/HDFPersist/HDFconvert.cc index 0249c933a..c2e11ba1c 100644 --- a/src/HDFPersist/HDFconvert.cc +++ b/src/HDFPersist/HDFconvert.cc @@ -27,6 +27,11 @@ #include "HDFconvert.hxx" using namespace std; +#ifdef WNT +#include +#include +#endif + int HDFConvert::FromAscii(const string& file, const HDFcontainerObject & hdf_container, const string& nomdataset) { @@ -43,7 +48,7 @@ int HDFConvert::FromAscii(const string& file, const HDFcontainerObject & hdf_con return -1; }; - // Lit l'état du fichier + // Lit l'‰tat du fichier if ( fstat(fd,&status) < 0) { perror("HDFConvert::FromAscii"); return -1; @@ -54,12 +59,25 @@ int HDFConvert::FromAscii(const string& file, const HDFcontainerObject & hdf_con #ifdef _POSIX_MAPPED_FILES - // Map le fichier en mémoire + // Map le fichier en m‰moire if ( (buffer = (char *) mmap(0,length,PROT_READ,MAP_SHARED,fd,0)) == MAP_FAILED ) { perror("HDFConvert::FromAscii"); return -1; }; - +#elif defined WNT + +#define SHMEMSIZE 4096 + + HANDLE hMapObject = CreateFileMapping( + INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, SHMEMSIZE, ""); + if (hMapObject != NULL) { + // Get a pointer to the file-mapped shared memory. + buffer = ( char* ) MapViewOfFile( + hMapObject, FILE_MAP_WRITE, 0, 0, 0 ); + if( buffer == NULL ) + CloseHandle(hMapObject); + }; + #else // Sort de la compilation @@ -69,7 +87,7 @@ int HDFConvert::FromAscii(const string& file, const HDFcontainerObject & hdf_con // Creation du Dataset utilisateur hdf_dataset = new HDFdataset( (char *) nomdataset.c_str(), /*discard const */ - (HDFcontainerObject*) &hdf_container, /*discard const, pas de constructeur par référence */ + (HDFcontainerObject*) &hdf_container, /*discard const, pas de constructeur par r‰f‰rence */ HDF_STRING, &length_long,1); // Cree le Dataset sur le disk diff --git a/src/HDFPersist/HDFconvert.hxx b/src/HDFPersist/HDFconvert.hxx index 42628a1c8..772fbcf70 100644 --- a/src/HDFPersist/HDFconvert.hxx +++ b/src/HDFPersist/HDFconvert.hxx @@ -30,8 +30,11 @@ extern "C" { #include "HDFtypes.h" +#ifndef WNT #include #include +#else +#endif #include #include #include diff --git a/src/HDFPersist/HDFdataset.hxx b/src/HDFPersist/HDFdataset.hxx index 58afc6510..b1e076903 100644 --- a/src/HDFPersist/HDFdataset.hxx +++ b/src/HDFPersist/HDFdataset.hxx @@ -33,8 +33,9 @@ extern "C" } #include "HDFinternalObject.hxx" #include "HDFcontainerObject.hxx" +#include -class HDFdataset : public HDFinternalObject +class Standard_EXPORT HDFdataset : public HDFinternalObject { private : HDFcontainerObject *_father; diff --git a/src/HDFPersist/HDFfile.cc b/src/HDFPersist/HDFfile.cc index 9fbe7d70d..ee987f73a 100644 --- a/src/HDFPersist/HDFfile.cc +++ b/src/HDFPersist/HDFfile.cc @@ -27,7 +27,12 @@ extern "C" { #include "hdfi.h" +#ifndef WNT #include +#else +#include +#define F_OK 0 +#endif #include } #include diff --git a/src/HDFPersist/HDFfile.hxx b/src/HDFPersist/HDFfile.hxx index 4194fdbbe..83bec3d33 100644 --- a/src/HDFPersist/HDFfile.hxx +++ b/src/HDFPersist/HDFfile.hxx @@ -32,8 +32,9 @@ extern "C" #include "HDFtypes.h" } #include "HDFcontainerObject.hxx" +#include -class HDFfile : public HDFcontainerObject +class Standard_EXPORT HDFfile : public HDFcontainerObject { private : hdf_access_mode _access_mode; diff --git a/src/HDFPersist/HDFgroup.hxx b/src/HDFPersist/HDFgroup.hxx index cca058448..eaf93aab6 100644 --- a/src/HDFPersist/HDFgroup.hxx +++ b/src/HDFPersist/HDFgroup.hxx @@ -32,8 +32,9 @@ extern "C" #include "HDFtypes.h" } #include "HDFcontainerObject.hxx" +#include -class HDFgroup : public HDFcontainerObject +class Standard_EXPORT HDFgroup : public HDFcontainerObject { private : HDFcontainerObject *_father; diff --git a/src/HDFPersist/HDFinternalObject.cc b/src/HDFPersist/HDFinternalObject.cc index 7ef6fb8e7..a1b948643 100644 --- a/src/HDFPersist/HDFinternalObject.cc +++ b/src/HDFPersist/HDFinternalObject.cc @@ -29,7 +29,9 @@ extern "C" #include "hdfi.h" } #include "HDFinternalObject.hxx" +#ifndef WNT using namespace std; +#endif HDFinternalObject::HDFinternalObject(char *name) : HDFobject(name) diff --git a/src/HDFPersist/HDFinternalObject.hxx b/src/HDFPersist/HDFinternalObject.hxx index 5e4acb81c..7aa0eb348 100644 --- a/src/HDFPersist/HDFinternalObject.hxx +++ b/src/HDFPersist/HDFinternalObject.hxx @@ -32,8 +32,9 @@ extern "C" #include "HDFtypes.h" } #include "HDFobject.hxx" +#include -class HDFinternalObject : public HDFobject +class Standard_EXPORT HDFinternalObject : public HDFobject { private : HDFinternalObject *_previousbrother; diff --git a/src/HDFPersist/HDFobject.hxx b/src/HDFPersist/HDFobject.hxx index e92647130..9d74c271f 100644 --- a/src/HDFPersist/HDFobject.hxx +++ b/src/HDFPersist/HDFobject.hxx @@ -31,8 +31,9 @@ extern "C" { #include "HDFtypes.h" } +#include -class HDFobject { +class Standard_EXPORT HDFobject { protected : char *_name; hdf_idt _id; diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx index 1af1f64e6..34ba164d5 100644 --- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx +++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx @@ -38,7 +38,11 @@ #include #include "SALOME_LifeCycleCORBA.hxx" +#ifndef WNT #include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog) +#else +#include "SALOME_ModuleCatalog.hh" +#endif #include "SALOME_ContainerManager.hxx" #include "SALOME_Component_i.hxx" #include "SALOME_NamingService.hxx" @@ -143,6 +147,7 @@ SALOME_LifeCycleCORBA::FindComponent(const Engines::MachineParameters& params, const char *instanceName) { ASSERT(0); + return 0; } //============================================================================= @@ -161,6 +166,7 @@ SALOME_LifeCycleCORBA::LoadComponent(const Engines::MachineParameters& params, int studyId) { ASSERT(0); + return 0; } //============================================================================= @@ -425,7 +431,11 @@ SALOME_LifeCycleCORBA::FindOrStartContainer(const string aComputerContainer , int count = 5 ; while ( CORBA::is_nil( aFactoryServer ) && count ) { +#ifndef WNT sleep( 1 ) ; +#else + Sleep(1); +#endif count-- ; if ( count != 10 ) MESSAGE( count << ". Waiting for FactoryServer on " << theComputer) diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx index fc4e9d479..92edb4b3a 100644 --- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx +++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx @@ -30,7 +30,9 @@ #define _SALOME_LIFECYCLECORBA_HXX_ #include +#ifndef WNT #include +#endif #include #include diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeComment.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeComment.cxx index ee3950094..6f87a6d34 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeComment.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeComment.cxx @@ -2,7 +2,9 @@ // Author : Sergey RUIN // Module : SALOME +#ifndef WNT using namespace std; +#endif #include "SALOMEDSImpl_AttributeComment.hxx" IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeComment, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeDrawable.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeDrawable.cxx index 31a94b518..e7c93508a 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeDrawable.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeDrawable.cxx @@ -2,7 +2,9 @@ // Author : Sergey RUIN // Module : SALOME +#ifndef WNT using namespace std; +#endif #include "SALOMEDSImpl_AttributeDrawable.hxx" IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeDrawable, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeExpandable.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeExpandable.cxx index 0216a575c..7688f77ec 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeExpandable.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeExpandable.cxx @@ -2,7 +2,9 @@ // Author : Sergey RUIN // Module : SALOME +#ifndef WNT using namespace std; +#endif #include "SALOMEDSImpl_AttributeExpandable.hxx" IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeExpandable, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeFlags.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeFlags.hxx index a142b6be4..a865bb2d3 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeFlags.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeFlags.hxx @@ -23,7 +23,11 @@ class Handle(TDF_RelocationTable); DEFINE_STANDARD_HANDLE( SALOMEDSImpl_AttributeFlags, SALOMEDSImpl_GenericAttribute ) +#ifndef WNT class Standard_EXPORT SALOMEDSImpl_AttributeFlags : public SALOMEDSImpl_GenericAttribute +#else +class SALOMEDSImpl_AttributeFlags : public SALOMEDSImpl_GenericAttribute +#endif { private: Standard_Integer myValue; diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeGraphic.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeGraphic.hxx index 4e958a9ab..700e0bb86 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeGraphic.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeGraphic.hxx @@ -25,7 +25,11 @@ DEFINE_STANDARD_HANDLE( SALOMEDSImpl_AttributeGraphic, SALOMEDSImpl_GenericAttr +#ifndef WNT class Standard_EXPORT SALOMEDSImpl_AttributeGraphic : public SALOMEDSImpl_GenericAttribute +#else +class SALOMEDSImpl_AttributeGraphic : public SALOMEDSImpl_GenericAttribute +#endif { public: diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.cxx index 0ee05dc2b..6bfd42ec5 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.cxx @@ -2,7 +2,9 @@ // Author : Sergey RUIN // Module : SALOME +#ifndef WNT using namespace std; +#endif #include "SALOMEDSImpl_AttributeIOR.hxx" #include #include "SALOMEDSImpl_Study.hxx" diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeInteger.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeInteger.cxx index 78988c0b8..895347903 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeInteger.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeInteger.cxx @@ -2,7 +2,9 @@ // Author : Sergey RUIN // Module : SALOME +#ifndef WNT using namespace std; +#endif #include "SALOMEDSImpl_AttributeInteger.hxx" IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeInteger, SALOMEDSImpl_GenericAttribute) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeLocalID.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeLocalID.cxx index 59489e809..0349e53b5 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeLocalID.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeLocalID.cxx @@ -2,10 +2,12 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_AttributeLocalID.hxx" #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeLocalID, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeLocalID, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeName.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeName.cxx index 1aa7c3717..1bddef5b4 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeName.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeName.cxx @@ -2,9 +2,11 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_AttributeName.hxx" +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeName, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeName, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeOpened.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeOpened.cxx index a91afbbe2..2f818b455 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeOpened.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeOpened.cxx @@ -2,10 +2,12 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_AttributeOpened.hxx" #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeOpened, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeOpened, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributePersistentRef.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributePersistentRef.cxx index 5b49e9876..99dbd8506 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributePersistentRef.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributePersistentRef.cxx @@ -2,10 +2,12 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_AttributePersistentRef.hxx" #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributePersistentRef, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributePersistentRef, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributePixMap.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributePixMap.cxx index 072341ba2..a05e411f9 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributePixMap.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributePixMap.cxx @@ -2,11 +2,12 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; #include "SALOMEDSImpl_AttributePixMap.hxx" #include #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributePixMap, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributePixMap, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributePythonObject.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributePythonObject.cxx index 71b12bf0f..1963e5379 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributePythonObject.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributePythonObject.cxx @@ -2,11 +2,12 @@ // Author : Michael Ponikarov // Module : SALOME -using namespace std; #include "SALOMEDSImpl_AttributePythonObject.hxx" #include #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributePythonObject, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributePythonObject, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeReal.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeReal.cxx index 2d1e16f27..e2f5ec902 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeReal.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeReal.cxx @@ -2,9 +2,10 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; #include "SALOMEDSImpl_AttributeReal.hxx" +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeReal, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeReal, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeReal.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeReal.hxx index de47ad445..9f1c66cf5 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeReal.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeReal.hxx @@ -25,7 +25,7 @@ private: Standard_Real myValue; public: -Standard_EXPORT Standard_EXPORT static const Standard_GUID& GetID() ; +Standard_EXPORT static const Standard_GUID& GetID() ; Standard_EXPORT SALOMEDSImpl_AttributeReal():SALOMEDSImpl_GenericAttribute("AttributeReal") {} Standard_EXPORT static Handle(SALOMEDSImpl_AttributeReal) Set (const TDF_Label& L, const Standard_Real Val); diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeReference.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeReference.cxx index 6677fddb5..4d3250b2a 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeReference.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeReference.cxx @@ -2,12 +2,13 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; #include "SALOMEDSImpl_AttributeReference.hxx" #include #include #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeReference, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeReference, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSelectable.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSelectable.cxx index 9fc8088cf..db93d3c2b 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSelectable.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSelectable.cxx @@ -2,10 +2,11 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; #include "SALOMEDSImpl_AttributeSelectable.hxx" #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeSelectable, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeSelectable, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx index 47b8ca653..3a0b50c2c 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx @@ -2,10 +2,11 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; #include "SALOMEDSImpl_AttributeSequenceOfInteger.hxx" #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeSequenceOfInteger, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeSequenceOfInteger, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfReal.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfReal.cxx index 5b038b61a..9ef1fafba 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfReal.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfReal.cxx @@ -2,10 +2,11 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; #include "SALOMEDSImpl_AttributeSequenceOfReal.hxx" #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeSequenceOfReal, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeSequenceOfReal, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx index b22df3386..3d7cc3d57 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx @@ -2,11 +2,12 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; #include #include #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeStudyProperties, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeStudyProperties, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx index 6723c2100..c5a0e9fde 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx @@ -2,13 +2,13 @@ // Author : Michael Ponikarov // Module : SALOME -using namespace std; #include #include #include #include #include +using namespace std; IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeTableOfInteger, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeTableOfInteger, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx index eb35801ec..32b20050f 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx @@ -2,7 +2,6 @@ // Author : Michael Ponikarov // Module : SALOME -using namespace std; #include #include #include @@ -10,6 +9,8 @@ using namespace std; #include #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeTableOfReal, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeTableOfReal, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx index 64e49ce02..3ca69a22f 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx @@ -2,13 +2,14 @@ // Author : Sergey Ruin // Module : SALOME -using namespace std; #include #include #include #include #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeTableOfString, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeTableOfString, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.cxx index 4c341b533..4b472467d 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.cxx @@ -2,7 +2,7 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_AttributeTarget.hxx" #include "SALOMEDSImpl_AttributeReference.hxx" #include "SALOMEDSImpl_Study.hxx" @@ -10,6 +10,8 @@ using namespace std; #include #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeTarget, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeTarget, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextColor.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextColor.cxx index 3ce415307..473d83853 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextColor.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextColor.cxx @@ -2,10 +2,12 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_AttributeTextColor.hxx" #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeTextColor, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeTextColor, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextHighlightColor.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextHighlightColor.cxx index 96fdefb62..cde769bc8 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextHighlightColor.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextHighlightColor.cxx @@ -2,10 +2,12 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_AttributeTextHighlightColor.hxx" #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeTextHighlightColor, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeTextHighlightColor, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTreeNode.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTreeNode.cxx index 299619443..51a2b23a4 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTreeNode.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTreeNode.cxx @@ -2,7 +2,7 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_AttributeTreeNode.hxx" #include #include @@ -11,6 +11,8 @@ using namespace std; #include #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeTreeNode, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeTreeNode, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeUserID.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeUserID.cxx index 8eebc2b41..5b5e8685c 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeUserID.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeUserID.cxx @@ -2,9 +2,11 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_AttributeUserID.hxx" +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeUserID, SALOMEDSImpl_GenericAttribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeUserID, SALOMEDSImpl_GenericAttribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_ChildIterator.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_ChildIterator.cxx index 053346ccd..79a21af63 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_ChildIterator.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_ChildIterator.cxx @@ -48,7 +48,7 @@ bool SALOMEDSImpl_ChildIterator::More() void SALOMEDSImpl_ChildIterator::Next() { - return _it.Next(); + _it.Next(); } Handle(SALOMEDSImpl_SObject) SALOMEDSImpl_ChildIterator::Value() diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_GenericAttribute.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_GenericAttribute.cxx index 5d8648e91..9c8f1f2bd 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_GenericAttribute.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_GenericAttribute.cxx @@ -2,12 +2,13 @@ // Author : SERGEY_RUIN // Module : SALOME -using namespace std; #include "SALOMEDSImpl_Attributes.hxx" #include "SALOMEDSImpl_Study.hxx" #include "SALOMEDSImpl_StudyBuilder.hxx" +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_GenericAttribute, TDF_Attribute ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_GenericAttribute, TDF_Attribute ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_OCAFApplication.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_OCAFApplication.cxx index 9d5addbf7..4dcdedf6d 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_OCAFApplication.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_OCAFApplication.cxx @@ -2,9 +2,10 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; #include "SALOMEDSImpl_OCAFApplication.hxx" +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_OCAFApplication, TDocStd_Application ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_OCAFApplication, TDocStd_Application ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_SComponent.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_SComponent.cxx index 4e542e1de..ed4eaefc8 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_SComponent.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_SComponent.cxx @@ -2,11 +2,13 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_SComponent.hxx" #include "SALOMEDSImpl_AttributeComment.hxx" #include "SALOMEDSImpl_AttributeIOR.hxx" +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_SComponent, SALOMEDSImpl_SObject ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_SComponent, SALOMEDSImpl_SObject ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_SComponent.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_SComponent.hxx index bc3c32923..af7317d83 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_SComponent.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_SComponent.hxx @@ -13,7 +13,7 @@ DEFINE_STANDARD_HANDLE( SALOMEDSImpl_SComponent, SALOMEDSImpl_SObject ) // std C++ headers -#include +#include // Cascade headers #include diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_SComponentIterator.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_SComponentIterator.cxx index ff3eaec0d..85aa53762 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_SComponentIterator.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_SComponentIterator.cxx @@ -2,10 +2,12 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_SComponentIterator.hxx" #include "SALOMEDSImpl_Study.hxx" +using namespace std; + //============================================================================ /*! Function : constructor * diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_SObject.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_SObject.cxx index 9ca0d5d58..6d967b372 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_SObject.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_SObject.cxx @@ -3,13 +3,15 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_SObject.hxx" #include "SALOMEDSImpl_Attributes.hxx" #include "SALOMEDSImpl_SComponent.hxx" #include "SALOMEDSImpl_Study.hxx" +using namespace std; + #include #include diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx index bdeea4ef9..6f63d4d5a 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx @@ -2,9 +2,11 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_Study.hxx" +using namespace std; + #include #include diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx index c4b0b2cf5..3696401a2 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx @@ -11,7 +11,7 @@ DEFINE_STANDARD_HANDLE( SALOMEDSImpl_Study, MMgt_TShared ) // std C++ headers -#include +#include // Cascade headers #include diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx index c7886194d..80f42b132 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx @@ -2,10 +2,12 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_Attributes.hxx" +using namespace std; + #include "SALOMEDSImpl_Study.hxx" #include "SALOMEDSImpl_StudyBuilder.hxx" #include "SALOMEDSImpl_SObject.hxx" diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.hxx index 6fc553ba3..0d81f4209 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.hxx @@ -11,7 +11,7 @@ DEFINE_STANDARD_HANDLE( SALOMEDSImpl_StudyBuilder, MMgt_TShared ) // std C++ headers -#include +#include // Cascade header #include diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyHandle.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyHandle.hxx index 7b60940c9..578d5948f 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyHandle.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyHandle.hxx @@ -22,23 +22,27 @@ DEFINE_STANDARD_HANDLE( SALOMEDSImpl_StudyHandle, TDF_Attribute ) #include "SALOMEDSImpl_Study.hxx" +#ifndef WNT class Standard_EXPORT SALOMEDSImpl_StudyHandle : public TDF_Attribute +#else +class SALOMEDSImpl_StudyHandle : public TDF_Attribute +#endif { public: - SALOMEDSImpl_StudyHandle(); - ~SALOMEDSImpl_StudyHandle() { myHandle.Nullify(); } - - static Handle(SALOMEDSImpl_StudyHandle) Set(const TDF_Label& theLabel, const Handle(SALOMEDSImpl_Study)& theStudy); - static const Standard_GUID& GetID() ; - - void SetHandle(const Handle(SALOMEDSImpl_Study)& theStudy) { myHandle = theStudy; } - Handle(SALOMEDSImpl_Study) GetHandle() { return myHandle; } - const Standard_GUID& ID() const; - void Restore( const Handle(TDF_Attribute)& theWith ); - Handle(TDF_Attribute) NewEmpty() const; - void Paste( const Handle(TDF_Attribute)& theInto, - const Handle(TDF_RelocationTable)& ) const; +Standard_EXPORT SALOMEDSImpl_StudyHandle(); +Standard_EXPORT ~SALOMEDSImpl_StudyHandle() { myHandle.Nullify(); } + +Standard_EXPORT static Handle(SALOMEDSImpl_StudyHandle) Set(const TDF_Label& theLabel, const Handle(SALOMEDSImpl_Study)& theStudy); +Standard_EXPORT static const Standard_GUID& GetID() ; + +Standard_EXPORT void SetHandle(const Handle(SALOMEDSImpl_Study)& theStudy) { myHandle = theStudy; } +Standard_EXPORT Handle(SALOMEDSImpl_Study) GetHandle() { return myHandle; } +Standard_EXPORT const Standard_GUID& ID() const; +Standard_EXPORT void Restore( const Handle(TDF_Attribute)& theWith ); +Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; +Standard_EXPORT void Paste( const Handle(TDF_Attribute)& theInto, + const Handle(TDF_RelocationTable)& ) const; private: Handle(SALOMEDSImpl_Study) myHandle; diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx index 71adf9b9b..fb784bda7 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx @@ -2,10 +2,10 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; - #include "SALOMEDSImpl_StudyManager.hxx" +using namespace std; + #include #include #include @@ -30,7 +30,7 @@ using namespace std; #include #include "HDFOI.hxx" -#include +#include #include IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_StudyManager, MMgt_TShared ) @@ -134,8 +134,16 @@ Handle(SALOMEDSImpl_Study) SALOMEDSImpl_StudyManager::Open(const TCollection_Asc } catch (HDFexception) { +#ifndef WNT char eStr[strlen(aUrl.ToCString())+17]; +#else + char *eStr; + eStr = new char[strlen(aUrl.ToCString())+17]; +#endif sprintf(eStr,"Can't open file %s",aUrl.ToCString()); +#ifdef WNT + delete [] eStr; +#endif _errorCode = TCollection_AsciiString(eStr); return NULL; } @@ -168,7 +176,11 @@ Handle(SALOMEDSImpl_Study) SALOMEDSImpl_StudyManager::Open(const TCollection_Asc } catch (HDFexception) { +#ifndef WNT char eStr[strlen(aUrl.ToCString())+17]; +#else + char *eStr = new char [strlen(aUrl.ToCString())+17]; +#endif sprintf(eStr,"Can't open file %s", aUrl.ToCString()); _errorCode = TCollection_AsciiString(eStr); return NULL; @@ -558,7 +570,15 @@ bool SALOMEDSImpl_StudyManager::Impl_SaveAs(const TCollection_AsciiString& aUrl, Handle(SALOMEDSImpl_AttributeInteger) anInteger; if(aCompSpecificSO->GetLabel().FindAttribute(SALOMEDSImpl_AttributeInteger::GetID(), anInteger)) { anInteger->SetValue(-1); - while(anInteger->Value() < 0) { sleep(2); if(++aTimeOut > AUTO_SAVE_TIME_OUT_IN_SECONDS) break; } + while(anInteger->Value() < 0) { +#ifndef WNT + sleep(2); +#else + Sleep(2); +#endif + if(++aTimeOut > AUTO_SAVE_TIME_OUT_IN_SECONDS) + break; + } } // if(aCompSpecificSO->FindAttribute(anInteger, "AttributeInteger")) } // if(!CORBA::is_nil(aCompSpecificSO)) } // if (strcmp(aRow[0], componentDataType) == 0) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx index 4a823fd36..1751be62f 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx @@ -1,4 +1,3 @@ -using namespace std; // File : SALOMEDSImpl_Tool.cxx // Created : Mon Oct 21 16:24:34 2002 // Author : Sergey RUIN @@ -10,8 +9,8 @@ using namespace std; #include "SALOMEDSImpl_Tool.hxx" #include -#include -#include +#include +#include #include #include #include @@ -21,9 +20,15 @@ using namespace std; #include #include +#ifndef WNT #include +#else +#include +#endif #include +using namespace std; + //============================================================================ // function : GetTempDir diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.cxx index db1b9bcd1..36700675a 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.cxx @@ -2,7 +2,7 @@ // Author : Sergey RUIN // Module : SALOME -using namespace std; + #include "SALOMEDSImpl_UseCaseBuilder.hxx" #include "SALOMEDSImpl_SObject.hxx" #include "SALOMEDSImpl_SComponent.hxx" @@ -17,6 +17,8 @@ using namespace std; #include #include +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_UseCaseBuilder, MMgt_TShared ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_UseCaseBuilder, MMgt_TShared ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseIterator.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseIterator.cxx index 7021609c0..7c32150d2 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseIterator.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseIterator.cxx @@ -2,11 +2,12 @@ // Author : Serge RUIN // Module : SALOME -using namespace std; #include "SALOMEDSImpl_UseCaseIterator.hxx" #include "SALOMEDSImpl_SObject.hxx" #include "SALOMEDSImpl_Study.hxx" +using namespace std; + IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_UseCaseIterator, MMgt_TShared ) IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_UseCaseIterator, MMgt_TShared ) diff --git a/src/TOOLSDS/SALOMEDS_Tool.cxx b/src/TOOLSDS/SALOMEDS_Tool.cxx index 23ded1040..8c292d493 100644 --- a/src/TOOLSDS/SALOMEDS_Tool.cxx +++ b/src/TOOLSDS/SALOMEDS_Tool.cxx @@ -11,9 +11,7 @@ #include "utilities.h" #include -#include -#include -#include + #include #include #include @@ -23,7 +21,13 @@ #include #include +#ifndef WNT +#include +#include +#include #include +#else +#endif #include #include CORBA_SERVER_HEADER(SALOMEDS_Attributes) -- 2.39.2