Merging with BR_WPdev_For_5_0

diff --git a/src/HDFPersist/HDFascii.cc b/src/HDFPersist/HDFascii.cc
index 5e1cf18a858f0ad3a781263faa5e12430b8cd859..4c265f63e82a73d2ca9b0b76de469aeb7e4c447a 100644 (file)
--- a/src/HDFPersist/HDFascii.cc
+++ b/src/HDFPersist/HDFascii.cc
@@ -35,6 +35,10 @@
 #ifdef WNT
 #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;
   
@@ -690,12 +698,14 @@ string GetTmpDir()
   }
 
 #ifdef WNT
+  //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)

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.hxx b/src/HDFPersist/HDFconvert.hxx
index 20b65affd2257235f700449b2762c7a052e69838..e4fae3a0674122816ae1421b797f37abaa9c1447 100644 (file)
--- a/src/HDFPersist/HDFconvert.hxx
+++ b/src/HDFPersist/HDFconvert.hxx
@@ -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..29b925ed0a1e8beb3ffb817be185d9e7e6484e90 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.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.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 3c829822ab5fa91e2d932c5836c34e5e9a70d06f..22b6a3b697488fdbc497f9cd23c47f35fa072413 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;