Win32 Porting.

Correction of Export/Import defines for Win32 platform.
Using WIN32 standard define instead WNT define of OpenCascade library.
Using Basics instead Utils library.
Removed "using namespace std" from header files.

diff --git a/src/DSC/DSC_User/Datastream/Calcium/CalciumCxxInterface.hxx b/src/DSC/DSC_User/Datastream/Calcium/CalciumCxxInterface.hxx
index 969b510e81bb032a7e0f23df514504bf3f0d0e8f..4f7c8259ef54e0ac210b0e7e9fa5336ec36e9de6 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Calcium/CalciumCxxInterface.hxx
+++ b/src/DSC/DSC_User/Datastream/Calcium/CalciumCxxInterface.hxx
@@ -163,7 +163,7 @@ namespace CalciumInterface {
               double        & ti,
               double const  & tf,
               long          & i,
-              const string  & nomVar, 
+              const std::string  & nomVar, 
               size_t          bufferLength,
               size_t        & nRead, 
               T1            * &data )
@@ -321,14 +321,14 @@ namespace CalciumInterface {
   // T1 est le type de données
   template <typename T1 > static void
   ecp_lecture ( Superv_Component_i & component,
-              int    const  & dependencyType,
-              double        & ti,
-              double const  & tf,
-              long          & i,
-              const string  & nomVar, 
-              size_t          bufferLength,
-              size_t        & nRead, 
-              T1            * &data )
+              int    const      & dependencyType,
+              double            & ti,
+              double const      & tf,
+              long              & i,
+              const std::string & nomVar, 
+              size_t              bufferLength,
+              size_t            & nRead, 
+              T1                * &data )
   {
     ecp_lecture<T1,T1> (component,dependencyType,ti,tf,
                        i,nomVar,bufferLength,nRead,data);
@@ -341,12 +341,12 @@ namespace CalciumInterface {
   // T2 : PortType
   template <typename T1, typename T2> static void
   ecp_ecriture ( Superv_Component_i & component,
-                int    const  & dependencyType,
-                double const  & t,
-                long   const  & i,
-                const string  & nomVar, 
-                size_t bufferLength,
-                T1     const  & data ) 
+                int    const      & dependencyType,
+                double const      & t,
+                long   const      & i,
+                const std::string & nomVar, 
+                size_t              bufferLength,
+                T1                  const  & data ) 
   {
     
     assert(&component);
@@ -521,7 +521,7 @@ namespace CalciumInterface {
                 int    const  & dependencyType,
                 double const  & t,
                 long   const  & i,
-                const string  & nomVar, 
+                const std::string  & nomVar, 
                 size_t bufferLength,
                 T1 const & data ) {
     ecp_ecriture<T1,T1> (component,dependencyType,t,i,nomVar,bufferLength,data); 

diff --git a/src/DSC/DSC_User/Datastream/Calcium/calcium_port_factory.cxx b/src/DSC/DSC_User/Datastream/Calcium/calcium_port_factory.cxx
index 504945a5710d0ad739f2213bcfc57b6f4859e526..121ede25dc4a3db711f7d5d832bc310954d48921 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Calcium/calcium_port_factory.cxx
+++ b/src/DSC/DSC_User/Datastream/Calcium/calcium_port_factory.cxx
@@ -28,6 +28,8 @@
 
 #include "calcium_port_factory.hxx"
 
+using namespace std;
+
 calcium_port_factory::calcium_port_factory() {}
 
 calcium_port_factory::~calcium_port_factory() {}

diff --git a/src/DSC/DSC_User/Datastream/Calcium/calcium_port_factory.hxx b/src/DSC/DSC_User/Datastream/Calcium/calcium_port_factory.hxx
index 6cb0504117eff1ac982a9cdc045a7f8f9246422f..03e317a99328cce71d768f4efc8589e5834636f1 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Calcium/calcium_port_factory.hxx
+++ b/src/DSC/DSC_User/Datastream/Calcium/calcium_port_factory.hxx
@@ -44,8 +44,6 @@
 #include "calcium_logical_port_uses.hxx"
 #include "calcium_complex_port_uses.hxx"
 
-using namespace std;
-
 class calcium_port_factory :
   public port_factory
 {
@@ -53,8 +51,8 @@ class calcium_port_factory :
     calcium_port_factory();
     virtual ~calcium_port_factory();
 
-    virtual provides_port * create_data_servant(string type); 
-    virtual uses_port * create_data_proxy(string type); 
+    virtual provides_port * create_data_servant(std::string type); 
+    virtual uses_port * create_data_proxy(std::string type); 
 };
 
 #endif

diff --git a/src/GenericObj/SALOME_GenericObj_i.cc b/src/GenericObj/SALOME_GenericObj_i.cc
index 2760b73db23489ca083acbaa7a29ac8a454ea7a7..9158f4ed9df26a48d4f2b327b4a2052d78262fcb 100644 (file)
--- a/src/GenericObj/SALOME_GenericObj_i.cc
+++ b/src/GenericObj/SALOME_GenericObj_i.cc
@@ -41,7 +41,7 @@ GenericObj_i::GenericObj_i(PortableServer::POA_ptr thePOA): myRefCounter(1){
     MESSAGE("GenericObj_i::GenericObj_i() - this = "<<this<<
            "; CORBA::is_nil(thePOA) = "<<CORBA::is_nil(thePOA));
   if(CORBA::is_nil(thePOA))
-#ifndef WNT
+#ifndef WIN32
     myPOA = PortableServer::ServantBase::_default_POA();
 #else
     myPOA = ServantBase::_default_POA();

diff --git a/src/GenericObj/SALOME_GenericObj_i.hh b/src/GenericObj/SALOME_GenericObj_i.hh
index a183b8cbb50299e20ff25fc7aa9348cdebeacc0d..8a3c87ff9dd3e6025ee4c1edfd8c165890f1c65c 100644 (file)
--- a/src/GenericObj/SALOME_GenericObj_i.hh
+++ b/src/GenericObj/SALOME_GenericObj_i.hh
@@ -31,18 +31,14 @@
 #include "SALOMEconfig.h"
 #include CORBA_SERVER_HEADER(SALOME_GenericObj)
 
-#if defined GENERICOBJ_EXPORTS
-#if defined WIN32
-#define GENERICOBJ_EXPORT __declspec( dllexport )
+#ifdef WIN32
+# ifdef GENERICOBJ_EXPORTS
+#  define GENERICOBJ_EXPORT __declspec( dllexport )
+# else
+#  define GENERICOBJ_EXPORT __declspec( dllimport )
+# endif
 #else
-#define GENERICOBJ_EXPORT
-#endif
-#else
-#if defined WNT
-#define GENERICOBJ_EXPORT __declspec( dllimport )
-#else
-#define GENERICOBJ_EXPORT
-#endif
+# define GENERICOBJ_EXPORT
 #endif
 
 namespace SALOME{

diff --git a/src/HDFPersist/HDFascii.cc b/src/HDFPersist/HDFascii.cc
index 5e1cf18a858f0ad3a781263faa5e12430b8cd859..3f93f145c105560c0d2b3ec36be2910fa4625864 100644 (file)
--- a/src/HDFPersist/HDFascii.cc
+++ b/src/HDFPersist/HDFascii.cc
@@ -32,9 +32,13 @@
 #include <stdio.h>
 #include <string>
 
-#ifdef WNT
+#ifdef WIN32
 #include <io.h>
 #include <time.h>
+#include <windows.h>
+#define dir_separator '\\'
+#else
+#define dir_separator '/'
 #endif
 
 using namespace std;
@@ -653,11 +657,12 @@ string GetTmpDir()
   char *Tmp_dir = getenv("SALOME_TMP_DIR");
   if(Tmp_dir != NULL) {
     aTmpDir = string(Tmp_dir);
-#ifdef WIN32
+    if(aTmpDir[aTmpDir.size()-1] != dir_separator) aTmpDir+=dir_separator;
+/*#ifdef WIN32
     if(aTmpDir[aTmpDir.size()-1] != '\\') aTmpDir+='\\';
 #else
     if(aTmpDir[aTmpDir.size()-1] != '/') aTmpDir+='/';
-#endif      
+#endif*/
   }
   else {
 #ifdef WIN32
@@ -676,11 +681,14 @@ string GetTmpDir()
 
   aTmpDir += aSubDir; //Get RND sub directory
 
+  if(aTmpDir[aTmpDir.size()-1] != dir_separator) aTmpDir+=dir_separator;
+/*
 #ifdef WIN32
   if(aTmpDir[aTmpDir.size()-1] != '\\') aTmpDir+='\\';
 #else
   if(aTmpDir[aTmpDir.size()-1] != '/') aTmpDir+='/';
 #endif
+  */
 
   string aDir = aTmpDir;
   
@@ -689,13 +697,15 @@ string GetTmpDir()
     aDir = aTmpDir+buffer;  //Build a unique directory name
   }
 
-#ifdef WNT
+#ifdef WIN32
+  //fuction CreateDirectory create only final directory, but not intermediate
+  CreateDirectory(aTmpDir.c_str(), NULL);
   CreateDirectory(aDir.c_str(), NULL);
 #else
   mkdir(aDir.c_str(), 0x1ff); 
 #endif
 
-  return aDir;
+  return aDir + dir_separator;
 }
 
 char* makeName(char* name)
@@ -753,7 +763,7 @@ void read_float64(FILE* fp, hdf_float64* value)
 
 bool Exists(const string thePath) 
 {
-#ifdef WNT 
+#ifdef WIN32 
   if (  GetFileAttributes (  thePath.c_str()  ) == 0xFFFFFFFF  ) { 
     if (  GetLastError () != ERROR_FILE_NOT_FOUND  ) {
       return false;
@@ -768,7 +778,7 @@ bool Exists(const string thePath)
 
 void Move(const string& fName, const string& fNameDst)
 { 
-#ifdef WNT
+#ifdef WIN32
   MoveFileEx (fName.c_str(), fNameDst.c_str(),MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED);
 #else
   rename(fName.c_str(), fNameDst.c_str());

diff --git a/src/HDFPersist/HDFascii.hxx b/src/HDFPersist/HDFascii.hxx
index 999b17352d12f8baaaa88a70eb2c67d128caf15f..254fc9de5ac3c59f51b9fa425c66d110af73c7d8 100644 (file)
--- a/src/HDFPersist/HDFascii.hxx
+++ b/src/HDFPersist/HDFascii.hxx
@@ -31,7 +31,7 @@
 #include "HDFexport.hxx"
 
 
-class HDF_EXPORT HDFascii                                
+class HDFPERSIST_EXPORT HDFascii                                
 {
 public:
  

diff --git a/src/HDFPersist/HDFattribute.hxx b/src/HDFPersist/HDFattribute.hxx
index 9ec84e75bf86bf4b63ef4472bf93549f6ebac243..9ede64cecec8a3df92efe2d1d788cec0b498a46c 100644 (file)
--- a/src/HDFPersist/HDFattribute.hxx
+++ b/src/HDFPersist/HDFattribute.hxx
@@ -34,7 +34,7 @@ extern "C"
 #include "HDFinternalObject.hxx"
 #include "HDFcontainerObject.hxx"
 
-class HDFattribute : public HDFobject
+class HDFPERSIST_EXPORT HDFattribute : public HDFobject
 {
 private :
   HDFinternalObject *_father;

diff --git a/src/HDFPersist/HDFcontainerObject.hxx b/src/HDFPersist/HDFcontainerObject.hxx
index dfc237b26665b102e00391617f3ccff70314b90a..117145c94ce0aea68ce52fca458a119f95757c6f 100644 (file)
--- a/src/HDFPersist/HDFcontainerObject.hxx
+++ b/src/HDFPersist/HDFcontainerObject.hxx
@@ -35,7 +35,7 @@ extern "C"
 #include "HDFinternalObject.hxx"
 #include "HDFexport.hxx"
 
-class HDF_EXPORT HDFcontainerObject : public HDFinternalObject
+class HDFPERSIST_EXPORT HDFcontainerObject : public HDFinternalObject
 { 
 private :
   HDFinternalObject *_firstson;

diff --git a/src/HDFPersist/HDFconvert.cc b/src/HDFPersist/HDFconvert.cc
index eaf7b21a579bf2e822231941e4afa8dcd146891b..6bac949e0885652ea224a4fdc1d0e9ae7a06508b 100644 (file)
--- a/src/HDFPersist/HDFconvert.cc
+++ b/src/HDFPersist/HDFconvert.cc
@@ -27,7 +27,7 @@
 #include "HDFconvert.hxx"
 using namespace std;
 
-#ifdef WNT
+#ifdef WIN32
 #include <io.h>
 #include <windows.h>
 #endif
@@ -64,7 +64,7 @@ int HDFConvert::FromAscii(const string& file, const HDFcontainerObject & hdf_con
     perror("HDFConvert::FromAscii");
     return -1;
   };
-#elif defined WNT
+#elif defined WIN32
 
 #define SHMEMSIZE 4096
 

diff --git a/src/HDFPersist/HDFconvert.hxx b/src/HDFPersist/HDFconvert.hxx
index 20b65affd2257235f700449b2762c7a052e69838..876340d4405cf6bd33402fde2574d3ea53074cc8 100644 (file)
--- a/src/HDFPersist/HDFconvert.hxx
+++ b/src/HDFPersist/HDFconvert.hxx
@@ -30,7 +30,7 @@
 extern "C"
 {
 #include "HDFtypes.h"
-#ifndef WNT
+#ifndef WIN32
 #include <unistd.h>
 #include <sys/mman.h>
 #else
@@ -41,13 +41,14 @@ extern "C"
 #include <sys/stat.h>
 #include <fcntl.h>
 }
+#include "HDFexport.hxx"
 #include "HDFcontainerObject.hxx"
 #include "HDFdataset.hxx"
 #include "HDFfile.hxx"
 #include <string>
 
 
-class HDFConvert 
+class HDFPERSIST_EXPORT HDFConvert 
 {
 private:
 

diff --git a/src/HDFPersist/HDFdataset.hxx b/src/HDFPersist/HDFdataset.hxx
index 1e2a62401346604a1c9123caef378d00c88c95bf..b27f8bade9913b02389bce58bd330afea13b6760 100644 (file)
--- a/src/HDFPersist/HDFdataset.hxx
+++ b/src/HDFPersist/HDFdataset.hxx
@@ -35,7 +35,7 @@ extern "C"
 #include "HDFcontainerObject.hxx"
 #include "HDFexport.hxx"
 
-class HDF_EXPORT HDFdataset : public HDFinternalObject
+class HDFPERSIST_EXPORT HDFdataset : public HDFinternalObject
 {
 private :
   HDFcontainerObject *_father;

diff --git a/src/HDFPersist/HDFexception.hxx b/src/HDFPersist/HDFexception.hxx
index 2ec2ce4a52544d409d9f87c52dc1e8e2842b7cca..7cc9c49865a67643c4ef56bf1411d52f9492d5d8 100644 (file)
--- a/src/HDFPersist/HDFexception.hxx
+++ b/src/HDFPersist/HDFexception.hxx
@@ -27,11 +27,13 @@
 #ifndef __HDFexception_H__
 #define __HDFexception_H__
 
+#include "HDFexport.hxx"
+
 /* Exception */
 #include <iostream>
 
 
-class HDFexception
+class HDFPERSIST_EXPORT HDFexception
 {
 public :
   HDFexception(const char *message) { 

diff --git a/src/HDFPersist/HDFexplorer.hxx b/src/HDFPersist/HDFexplorer.hxx
index e66fbe390560455f5942828b607e57e691d27ddb..c2d5f368222d5462b85996581b640b985d4699de 100644 (file)
--- a/src/HDFPersist/HDFexplorer.hxx
+++ b/src/HDFPersist/HDFexplorer.hxx
@@ -30,7 +30,7 @@
 #include "HDFinternalObject.hxx"
 #include "HDFcontainerObject.hxx"
 
-class HDFexplorer {
+class HDFPERSIST_EXPORT HDFexplorer {
 private :
   int _size;
   HDFcontainerObject *_container;

diff --git a/src/HDFPersist/HDFexport.hxx b/src/HDFPersist/HDFexport.hxx
index 21b64d34e8d19fd665818a9bca981fa4dc88f27d..060b1e592cd71473e2371f972d1665539c81e609 100644 (file)
--- a/src/HDFPersist/HDFexport.hxx
+++ b/src/HDFPersist/HDFexport.hxx
@@ -26,14 +26,14 @@
 #ifndef _HDF_export_HXX_
 #define _HDF_export_HXX_
 
-#ifdef WNT
-  #if defined WIN32
-   #define HDF_EXPORT __declspec( dllimport )
-  #else
-   #define HDF_EXPORT
-  #endif
+#ifdef WIN32
+# ifdef HDFPERSIST_EXPORTS
+#  define HDFPERSIST_EXPORT __declspec( dllexport )
+# else
+#  define HDFPERSIST_EXPORT __declspec( dllimport )
+# endif
 #else
- #define HDF_EXPORT
+# define HDFPERSIST_EXPORT
 #endif
 
 #endif

diff --git a/src/HDFPersist/HDFfile.cc b/src/HDFPersist/HDFfile.cc
index 96c76359877ec496f0c26c2d97a2f7da97646f90..aea67a55a2e24277b7355b554a90115779669ec8 100644 (file)
--- a/src/HDFPersist/HDFfile.cc
+++ b/src/HDFPersist/HDFfile.cc
@@ -27,7 +27,7 @@
 extern "C"
 {
 #include "hdfi.h"
-#ifndef WNT
+#ifndef WIN32
 #include <unistd.h>
 #else
 #include <io.h>

diff --git a/src/HDFPersist/HDFfile.hxx b/src/HDFPersist/HDFfile.hxx
index b1d32881f46384772c535114f3747f7da11f1572..2f908cf9f5b724f1f8527db10659d74da3d0e794 100644 (file)
--- a/src/HDFPersist/HDFfile.hxx
+++ b/src/HDFPersist/HDFfile.hxx
@@ -34,7 +34,7 @@ extern "C"
 #include "HDFcontainerObject.hxx"
 #include "HDFexport.hxx"
 
-class HDF_EXPORT HDFfile : public HDFcontainerObject
+class HDFPERSIST_EXPORT HDFfile : public HDFcontainerObject
 {
 private :
   hdf_access_mode _access_mode;

diff --git a/src/HDFPersist/HDFgroup.hxx b/src/HDFPersist/HDFgroup.hxx
index 07e79e36e20810f0a734ab08648599fb0f2001b9..0a1bbc4077b9365cac4084893ee00e79c863c035 100644 (file)
--- a/src/HDFPersist/HDFgroup.hxx
+++ b/src/HDFPersist/HDFgroup.hxx
@@ -34,7 +34,7 @@ extern "C"
 #include "HDFcontainerObject.hxx"
 #include "HDFexport.hxx"
 
-class HDF_EXPORT HDFgroup : public HDFcontainerObject
+class HDFPERSIST_EXPORT HDFgroup : public HDFcontainerObject
 {
 private :
   HDFcontainerObject *_father;

diff --git a/src/HDFPersist/HDFinternalObject.cc b/src/HDFPersist/HDFinternalObject.cc
index 716e6da494bc6329828c456d136e14435f1c122d..3ea1f036474abefd24b2ffc6f877f0e85b960236 100644 (file)
--- a/src/HDFPersist/HDFinternalObject.cc
+++ b/src/HDFPersist/HDFinternalObject.cc
@@ -29,9 +29,8 @@ extern "C"
 #include "hdfi.h"
 }
 #include "HDFinternalObject.hxx"
-#ifndef WNT
+
 using namespace std;
-#endif
 
 HDFinternalObject::HDFinternalObject(const char *name)
   : HDFobject(name)

diff --git a/src/HDFPersist/HDFinternalObject.hxx b/src/HDFPersist/HDFinternalObject.hxx
index ee4c32e51ece1e99d43b550ef9aa29059cbc7eb6..232305016a0ff96b79f6bd75630e0b9c03de194f 100644 (file)
--- a/src/HDFPersist/HDFinternalObject.hxx
+++ b/src/HDFPersist/HDFinternalObject.hxx
@@ -34,7 +34,7 @@ extern "C"
 #include "HDFobject.hxx"
 #include "HDFexport.hxx"
 
-class HDF_EXPORT HDFinternalObject : public HDFobject
+class HDFPERSIST_EXPORT HDFinternalObject : public HDFobject
 {
 private :
   HDFinternalObject *_previousbrother;

diff --git a/src/HDFPersist/HDFobject.cc b/src/HDFPersist/HDFobject.cc
index 5adb8aafea2a97474c44a33ee973689295575ad3..e4f751a9bc7bd62ffd49fe0c2215483f6597ceb5 100644 (file)
--- a/src/HDFPersist/HDFobject.cc
+++ b/src/HDFPersist/HDFobject.cc
@@ -28,8 +28,9 @@
 extern "C"
 {
 #include "hdfi.h"
-#include <string.h>
 }
+
+#include <string>
 //#include "utilities.h"
 using namespace std;
 

diff --git a/src/HDFPersist/HDFobject.hxx b/src/HDFPersist/HDFobject.hxx
index 9dafc444774b1f648d3014ef49e4f7c84a7b4358..9862e84282903256f11a42a93794bb1b1d435030 100644 (file)
--- a/src/HDFPersist/HDFobject.hxx
+++ b/src/HDFPersist/HDFobject.hxx
@@ -33,7 +33,7 @@ extern "C"
 }
 #include "HDFexport.hxx"
 
-class HDF_EXPORT HDFobject {
+class HDFPERSIST_EXPORT HDFobject {
 protected :
   char *_name;
   hdf_idt _id;