ENV: Windows porting.

diff --git a/src/HDFPersist/HDFascii.cc b/src/HDFPersist/HDFascii.cc
index e5719df68a24a96f0b3fbff3dc08140f3f52cd73..186d2bcd06fb00d3c5d9ac7d0b44e51c60cd0371 100644 (file)
--- a/src/HDFPersist/HDFascii.cc
+++ b/src/HDFPersist/HDFascii.cc
@@ -18,6 +18,12 @@
 #include <string.h>
 #include <fcntl.h>
 #include <stdio.h>
+
+#ifdef WNT
+#include <io.h>
+#include <time.h>
+#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; j<nbAttr; j++) {
+#else
+  for(j=0; j<nbAttr; j++) {
+#endif
     name = hdf_dataset->GetAttributeName(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 5ae7e584672948443456991549c6ae88d2548b4c..4ae3f17484859722f8f5edd624d51462574cd2a1 100644 (file)
--- a/src/HDFPersist/HDFascii.hxx
+++ b/src/HDFPersist/HDFascii.hxx
@@ -10,10 +10,10 @@
 #ifndef __HDFascii_H__
 #define __HDFascii_H__
 
+#include <Standard_Macro.hxx>
 
 
-
-class HDFascii                                
+class Standard_EXPORT HDFascii                                
 {
 public:
  

diff --git a/src/HDFPersist/HDFcontainerObject.hxx b/src/HDFPersist/HDFcontainerObject.hxx
index b95bef33cdfc75b701f8f80fbf33e87083201a8f..efc1fd9ed690145328b093709c6cb5ecab8710e7 100644 (file)
--- a/src/HDFPersist/HDFcontainerObject.hxx
+++ b/src/HDFPersist/HDFcontainerObject.hxx
@@ -33,8 +33,9 @@ extern "C"
 }
 #include "HDFobject.hxx"
 #include "HDFinternalObject.hxx"
+#include <Standard_Macro.hxx>
 
-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 0249c933ae5a763c30b2bdcf2be8095746a40d7f..c2e11ba1ca89c4fece8634bc24d5508a813ccfb3 100644 (file)
--- a/src/HDFPersist/HDFconvert.cc
+++ b/src/HDFPersist/HDFconvert.cc
@@ -27,6 +27,11 @@
 #include "HDFconvert.hxx"
 using namespace std;
 
+#ifdef WNT
+#include <io.h>
+#include <windows.h>
+#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'\89tat 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\89moire
   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\89f\89rence */
                                             HDF_STRING,
                                             &length_long,1);
   // Cree le Dataset sur le disk

diff --git a/src/HDFPersist/HDFconvert.hxx b/src/HDFPersist/HDFconvert.hxx
index 42628a1c8bf43d07772bcf865cc0a4a10db61bfa..772fbcf70a64175f42fb76a11dbbf5bb4db38b99 100644 (file)
--- a/src/HDFPersist/HDFconvert.hxx
+++ b/src/HDFPersist/HDFconvert.hxx
@@ -30,8 +30,11 @@
 extern "C"
 {
 #include "HDFtypes.h"
+#ifndef WNT
 #include <unistd.h>
 #include <sys/mman.h>
+#else
+#endif
 #include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>

diff --git a/src/HDFPersist/HDFdataset.hxx b/src/HDFPersist/HDFdataset.hxx
index 58afc6510d54233015d2b0d4aabecdcf99459cd2..b1e076903688c9ea8c3707be497b8d8a41e779b7 100644 (file)
--- a/src/HDFPersist/HDFdataset.hxx
+++ b/src/HDFPersist/HDFdataset.hxx
@@ -33,8 +33,9 @@ extern "C"
 }
 #include "HDFinternalObject.hxx"
 #include "HDFcontainerObject.hxx"
+#include <Standard_Macro.hxx>
 
-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 9fbe7d70d005b21d1ec720ab0386fba59e6860f8..ee987f73a95848addc797c5d06c915889d519e45 100644 (file)
--- a/src/HDFPersist/HDFfile.cc
+++ b/src/HDFPersist/HDFfile.cc
@@ -27,7 +27,12 @@
 extern "C"
 {
 #include "hdfi.h"
+#ifndef WNT
 #include <unistd.h>
+#else
+#include <io.h>
+#define F_OK 0
+#endif
 #include <string.h>
 }
 #include <iostream.h>

diff --git a/src/HDFPersist/HDFfile.hxx b/src/HDFPersist/HDFfile.hxx
index 4194fdbbeb7616d3e749f5910b3a59bfdd3440ff..83bec3d33104483e6f305a2bc2770caa35dc5e96 100644 (file)
--- a/src/HDFPersist/HDFfile.hxx
+++ b/src/HDFPersist/HDFfile.hxx
@@ -32,8 +32,9 @@ extern "C"
 #include "HDFtypes.h"
 }
 #include "HDFcontainerObject.hxx"
+#include <Standard_Macro.hxx>
 
-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 cca0584488adc5016dc8cc66b05d0b25147728dd..eaf93aab6fb917543c9e3bfafc18cddb64f6f5d1 100644 (file)
--- a/src/HDFPersist/HDFgroup.hxx
+++ b/src/HDFPersist/HDFgroup.hxx
@@ -32,8 +32,9 @@ extern "C"
 #include "HDFtypes.h"
 }
 #include "HDFcontainerObject.hxx"
+#include <Standard_Macro.hxx>
 
-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 7ef6fb8e7267fbad8b31af80c2d497313ec5e5c3..a1b9486438d90d382bb0a3c07709a17d5b198af0 100644 (file)
--- 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 5e4acb81cae5bff67bbf89d0ec1322958ca36994..7aa0eb3483c303e0f13094661b768c6caadaaff1 100644 (file)
--- a/src/HDFPersist/HDFinternalObject.hxx
+++ b/src/HDFPersist/HDFinternalObject.hxx
@@ -32,8 +32,9 @@ extern "C"
 #include "HDFtypes.h"
 }
 #include "HDFobject.hxx"
+#include <Standard_Macro.hxx>
 
-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 e9264713076e68752af417cf07017f461128d3c2..9d74c271f1bbf4428a9a9e3a3e5a86607803eab9 100644 (file)
--- a/src/HDFPersist/HDFobject.hxx
+++ b/src/HDFPersist/HDFobject.hxx
@@ -31,8 +31,9 @@ extern "C"
 {
 #include "HDFtypes.h"
 }
+#include <Standard_Macro.hxx>
 
-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 1af1f64e6fd29325fc42eb6759c70d291ce79eeb..34ba164d545f0b6e945a77ef837e2f480e7b2f7d 100644 (file)
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
@@ -38,7 +38,11 @@
 #include <ServiceUnreachable.hxx>
 
 #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 fc4e9d4792c15ca0683d95de6923b8254ff38991..92edb4b3a9c9242be205c846732f8a83c78b6897 100644 (file)
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
@@ -30,7 +30,9 @@
 #define _SALOME_LIFECYCLECORBA_HXX_
 
 #include <stdlib.h>
+#ifndef WNT
 #include <unistd.h>
+#endif
 #include <string>
 
 #include <SALOMEconfig.h>

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeComment.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeComment.cxx
index ee39500942661f23448185ad9b9ff81330cfa4ed..6f87a6d347577cd9abd020cb806bb0332c997305 100644 (file)
--- 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 31a94b518e4fd9e4f449e6df805809ca11c679c4..e7c93508af374b2e80b56c4874754c3d0882f791 100644 (file)
--- 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 0216a575ca3544dbab602c67fb25962dfeba7e7c..7688f77ec88d9f738b63af29e50042fd0e75909e 100644 (file)
--- 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 a142b6be4c1d71ab3cadf168c8e0b0bc8bd545cf..a865bb2d32b70640b6d58fcdff44e1aece9f7a43 100644 (file)
--- 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 4e958a9ab8ddb9ef6f3f7e9def6ae4d8eb6b19bd..700e0bb86b13fd78e4fe8b9f5a52ecc5ef22bbfc 100644 (file)
--- 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 0ee05dc2b123d9592d7bcf2a98216fb341d292c1..6bfd42ec5f19ed50d17932d939abf16f4940eeeb 100644 (file)
--- 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 <TCollection_AsciiString.hxx>
 #include "SALOMEDSImpl_Study.hxx"

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeInteger.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeInteger.cxx
index 78988c0b8cd7ec0c7428f977bee73a9ad98faad0..89534790352e15f8ccf6986a17da1ee79698a20e 100644 (file)
--- 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 59489e8092ae94df2ad43c9655d4ba997c48d2d8..0349e53b556297628ca37a8fdd4f3f838a07e71e 100644 (file)
--- 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 <Standard_GUID.hxx>
 
+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 1aa7c37175a54d8b0395172a8ea30f375630be7c..1bddef5b49e7bfee831d2bec4785ecdf325ad753 100644 (file)
--- 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 a91afbbe2f260266c8f62267e107aaf6dddfdaf5..2f818b455c52457f1710a61d9009bf68e63de101 100644 (file)
--- 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 <Standard_GUID.hxx>
 
+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 5b49e9876ac1318c9d09e4100bdbb1c57f440c24..99dbd85061383509c22ec18c3e1f6bf3834484df 100644 (file)
--- 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 <Standard_GUID.hxx>
 
+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 072341ba26b7a4eb8f1f54eee444a6c0325b6b3a..a05e411f93f504e6244ee284628bdf8aef814c34 100644 (file)
--- 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 <TCollection_ExtendedString.hxx>
 #include <Standard_GUID.hxx>
 
+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 71b12bf0f3ce2e00c30ac1813020334eeff3f6c4..1963e5379aaede56e2ea78b7ac6e88c3d788ca02 100644 (file)
--- 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 <Standard_GUID.hxx>
 #include <string>
 
+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 2d1e16f2758329cd4194f025cda1dd96babb8a14..e2f5ec902666881b57d9383ba89b956dbb130047 100644 (file)
--- 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 de47ad445d8998a4c7a4939ef0f6d9328c7d9a64..9f1c66cf53593baa418fe8a32115fde9c5101117 100644 (file)
--- 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 6677fddb51fa5fb4efd1821101677e5ae3c614ce..4d3250b2afcbed5f7420f0665e9f2dea63ec4be2 100644 (file)
--- 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 <TDF_Tool.hxx>
 #include <TDF_Data.hxx>
 #include <TDF_RelocationTable.hxx>
 
+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 9fc8088cffe864add00faad157c8ab497d527350..db93d3c2b14a3d64a2991e2503c372e86c371043 100644 (file)
--- 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 <Standard_GUID.hxx>
 
+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 47b8ca65307f44850ac5fbabc06c8827c68e034e..3a0b50c2cd5dadf86589e4578d410c88e1efc7ce 100644 (file)
--- 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 <Standard_GUID.hxx>
 
+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 5b038b61ab326acb0eb3b7f8ad28656d1dfaac17..9ef1fafba215ff445fb68a34ae3981e8d3b8d97a 100644 (file)
--- 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 <Standard_GUID.hxx>
 
+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 b22df3386e1606c149685b84f9694bf7a8adc99c..3d7cc3d575b407582e87ed21aede9f1e7bf27ff9 100644 (file)
--- 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 <SALOMEDSImpl_AttributeStudyProperties.hxx>
 #include <Standard_GUID.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+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 6723c2100d64e2c91bacac9cc544130312f40608..c5a0e9fde1d8ad2a7694015e2df1cf57f4509545 100644 (file)
--- 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 <SALOMEDSImpl_AttributeTableOfInteger.hxx>
 #include <Standard_Failure.hxx>
 #include <TColStd_DataMapIteratorOfDataMapOfIntegerInteger.hxx>
 #include <Standard_GUID.hxx>
 #include <TColStd_HSequenceOfExtendedString.hxx>
 
+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 eb35801ecce4897757075e7a37eaf9997f2cf483..32b20050f9c24a3b0734fbc094f7ab22fd08344a 100644 (file)
--- 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 <SALOMEDSImpl_AttributeTableOfReal.hxx>
 #include <Standard_Failure.hxx>
 #include <TColStd_DataMapIteratorOfDataMapOfIntegerReal.hxx>
@@ -10,6 +9,8 @@ using namespace std;
 #include <stdio.h>
 #include <TColStd_HSequenceOfExtendedString.hxx>  
 
+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 64e49ce02c7383f74502ddc7e0700201522f0686..3ca69a22f8771a8675d9d5a4a1496fdb92f5fda9 100644 (file)
--- 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 <SALOMEDSImpl_AttributeTableOfString.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_GUID.hxx>
 #include <stdio.h>
 #include <TColStd_HSequenceOfExtendedString.hxx>  
 
+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 4c341b53328181bd7e59f5e358295bdce7eba6da..4b472467d091f7ec8eef5aa0066b5be89ef9bec4 100644 (file)
--- 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 <TDF_ListIteratorOfAttributeList.hxx>
 #include <Standard_GUID.hxx>
 
+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 3ce415307d41aa054d73cdefbfb23b6088303207..473d8385363bf22618c0fcc3aef3dcea6e75c899 100644 (file)
--- 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 <Standard_GUID.hxx>
 
+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 96fdefb628d95097fabaab9ea8b1f6cc802c7638..cde769bc8f027328a584a5c019721cf5c1c091b9 100644 (file)
--- 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 <Standard_GUID.hxx>
 
+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 2996194435bf743aad224f03f83afc0cb402e25f..51a2b23a4db440a1b1106812a81d79d44aefbe47 100644 (file)
--- 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 <Standard_DomainError.hxx>
 #include <TDF_Tool.hxx>
@@ -11,6 +11,8 @@ using namespace std;
 #include <TDF_RelocationTable.hxx>
 #include <TCollection_AsciiString.hxx> 
 
+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 8eebc2b41516fee9e4d427c1c98fa1313c84e92d..5b5e8685c044fa3107674f5cfb92ba1a66aca371 100644 (file)
--- 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 053346ccd138eaea8956781a18892c3ae14c1d01..79a21af63c4ee69829722f81fb91418446d1d8c5 100644 (file)
--- 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 5d8648e915251126e827a0141fb18aedf8ffeb60..9c8f1f2bda21d0e7c21f24b936ba684f6b678f8b 100644 (file)
--- 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 9d5addbf7c1b8af9e2dfe4ba4d26e39252fabfb1..4dcdedf6d8a8e4b9761cf7231f0c9942048ad4d0 100644 (file)
--- 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 4e542e1ded7c264bd0931a81c06fd94d8211d9ce..ed4eaefc82540ddc9aad5c0760deabc09b594589 100644 (file)
--- 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 bc3c32923483fdbf9950779f6d3b83556aaeab15..af7317d8376eae206f6bd73c57e868255b866d2e 100644 (file)
--- 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 <iostream.h>
+#include <iostream>
 
 // Cascade headers
 #include <TDF_Label.hxx>

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_SComponentIterator.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_SComponentIterator.cxx
index ff3eaec0d56b6efa38951f0ea68f5f15114b6a59..85aa537623cef5e4da128f95597ece91497f083a 100644 (file)
--- 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 9ca0d5d582f7b61e65b81cdd21fdadcb33eb737d..6d967b37216a60d55030359d7ccf1de6c84a5315 100644 (file)
--- 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 <TDF_AttributeIterator.hxx>
 #include <map>
 

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
index bdeea4ef9f56d15f31b6b6bd7fcf350b8793810f..6f63d4d5a60800141fa243123939d6bdbb67a71f 100644 (file)
--- 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 <TColStd_SequenceOfExtendedString.hxx>
 #include <TCollection_ExtendedString.hxx>
 

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx
index c4b0b2cf5cb0b0d1ae24f32481352a67cb4138f6..3696401a2310a58250157d5eb6c6af38d55a4f4e 100644 (file)
--- 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 <iostream.h>
+#include <iostream>
 
 // Cascade headers
 #include <TDocStd_Document.hxx>

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx
index c7886194d0b8f2563122c5e7097705b3702e2773..80f42b13235c6aef200cd6ec11fd32f9acbecd8a 100644 (file)
--- 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 6fc553ba39b0ee69b1754001a49f2dff9ec80b6f..0d81f42095b897d8db92091f4d153bfe988d054d 100644 (file)
--- 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 <iostream.h>
+#include <iostream>
 
 // Cascade header
 #include <TCollection_AsciiString.hxx>

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyHandle.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyHandle.hxx
index 7b60940c90314d5a95c47acbc1104a6e348f1b26..578d5948f9f4060687dfb0aed0a5a92bfcc8edfd 100644 (file)
--- 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 71adf9b9b798616264d7b748e23064789e89c148..fb784bda705dd2cdd52e300f4faae445698e8fbc 100644 (file)
--- 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 <CDF_Session.hxx>
 #include <CDF_DirectoryIterator.hxx>
 #include <TDF_Label.hxx>
@@ -30,7 +30,7 @@ using namespace std;
 #include <map>
 
 #include "HDFOI.hxx"
-#include <iostream.h>
+#include <iostream>
 #include <stdlib.h>
 
 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 4a823fd36d943ca108a2080788408ddc25388706..1751be62f78dc3857fc46ae72c12dd27c94b6842 100644 (file)
--- 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 <stdio.h>
-#include <iostream.h> 
-#include <fstream.h>
+#include <iostream> 
+#include <fstream>
 #include <OSD_Path.hxx>
 #include <OSD_File.hxx>
 #include <OSD_Directory.hxx>
@@ -21,9 +20,15 @@ using namespace std;
 #include <OSD_SingleProtection.hxx>
 #include <OSD_FileIterator.hxx>
 
+#ifndef WNT
 #include <sys/time.h>
+#else
+#include <time.h>
+#endif
 #include <stdlib.h>
 
+using namespace std;
+
 
 //============================================================================
 // function : GetTempDir

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.cxx
index db1b9bcd19d80d3f0c41a683b58ccfe5ded65cb4..36700675a39808b8a9c19dd9ec18f57e0b12d35e 100644 (file)
--- 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 <TCollection_AsciiString.hxx>
 #include <TDF_ChildIterator.hxx>
 
+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 7021609c034f8604ae57387bec07fb7cacddc4d0..7c32150d296af624eeba597f8e05f05286c193dd 100644 (file)
--- 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 23ded1040c7171bff4788973e2ea58b4903faaa6..8c292d49376556979e982be82cf15e538150cd7e 100644 (file)
--- a/src/TOOLSDS/SALOMEDS_Tool.cxx
+++ b/src/TOOLSDS/SALOMEDS_Tool.cxx
@@ -11,9 +11,7 @@
 #include "utilities.h"
 
 #include <TCollection_AsciiString.hxx> 
-#include <stdio.h>
-#include <iostream.h> 
-#include <fstream.h>
+
 #include <OSD_Path.hxx>
 #include <OSD_File.hxx>
 #include <OSD_Directory.hxx>
@@ -23,7 +21,13 @@
 #include <OSD_SingleProtection.hxx>
 #include <OSD_FileIterator.hxx>
 
+#ifndef WNT
+#include <stdio.h>
+#include <iostream.h> 
+#include <fstream.h>
 #include <sys/time.h>
+#else
+#endif
 #include <stdlib.h>
 
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)