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/Palm/PalmCouplingPolicy.hxx b/src/DSC/DSC_User/Datastream/Palm/PalmCouplingPolicy.hxx
index c5f57fff49ed5275ac27837bb08b92e90f174a94..ac23a59ce672dcab8f1d2925ee8ea5b6ee1c57e6 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Palm/PalmCouplingPolicy.hxx
+++ b/src/DSC/DSC_User/Datastream/Palm/PalmCouplingPolicy.hxx
@@ -87,11 +87,11 @@ public:
       std::cout << "----Cst ----  InternalDataIdContainer(const DataId & dataId..) " << dataId <<std::endl;
       policy.filtre_convert_TIME.applique_filtre_conversion(dataId.first, _lTime);
       int c=0;
-      for(vector<CORBA::Long>::iterator i=_lTime.begin();i!=_lTime.end();++i)
+      for(std::vector<CORBA::Long>::iterator i=_lTime.begin();i!=_lTime.end();++i)
        std::cout << "_lTime["<< c++ << "] : " << *i << std::endl;
       policy.filtre_convert_TAG.applique_filtre_conversion(dataId.second, _lTag);
       c=0;
-      for(vector<CORBA::Long>::iterator i=_lTag.begin();i!=_lTag.end();++i)
+      for(std::vector<CORBA::Long>::iterator i=_lTag.begin();i!=_lTag.end();++i)
        std::cout << "_lTag["<< c++ << "] : " << *i << std::endl;
     }
 

diff --git a/src/DSC/DSC_User/Datastream/Palm/palm_port_factory.cxx b/src/DSC/DSC_User/Datastream/Palm/palm_port_factory.cxx
index 2c194efb14014503d9af8861586fb217902dbf8b..43107b1331d5d19a9df9f76695f6a269848d75d5 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Palm/palm_port_factory.cxx
+++ b/src/DSC/DSC_User/Datastream/Palm/palm_port_factory.cxx
@@ -29,6 +29,8 @@
 
 #include "palm_port_factory.hxx"
 
+using namespace std;
+
 palm_port_factory::palm_port_factory() {
 }
 

diff --git a/src/DSC/DSC_User/Datastream/Palm/palm_port_factory.hxx b/src/DSC/DSC_User/Datastream/Palm/palm_port_factory.hxx
index 544a9c1eb8c67985ff7cccc0457f32a0fe89cd3f..c8007374b670a17e85ec704502c54415648f7763 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Palm/palm_port_factory.hxx
+++ b/src/DSC/DSC_User/Datastream/Palm/palm_port_factory.hxx
@@ -38,8 +38,6 @@
 #include "palm_data_short_port_provides.hxx"
 #include "palm_data_seq_short_port_provides.hxx"
 
-using namespace std;
-
 class palm_port_factory :
   public port_factory
 {
@@ -47,8 +45,8 @@ class palm_port_factory :
     palm_port_factory();
     virtual ~palm_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/Notification/SALOME_NOTIFICATION.hxx b/src/Notification/SALOME_NOTIFICATION.hxx
index c187b411909535e819b2230d6f355eb44da649f3..bc58c084e092b67cf5f06ac4bb7c980fcf86c89e 100755 (executable)
--- a/src/Notification/SALOME_NOTIFICATION.hxx
+++ b/src/Notification/SALOME_NOTIFICATION.hxx
@@ -26,22 +26,14 @@
 #ifndef _SALOME_NOTIFICATION_HXX_
 #define _SALOME_NOTIFICATION_HXX_
 
-#ifdef WNT
- #if defined NOTIFICATION_EXPORTS
-  #if defined WIN32
-   #define NOTIFICATION_EXPORT __declspec( dllexport )
-  #else
-   #define NOTIFICATION_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define NOTIFICATION_EXPORT __declspec( dllimport )
-  #else
-   #define NOTIFICATION_EXPORT
-  #endif
- #endif
+#ifdef WIN32
+# ifdef NOTIFICATION_EXPORTS
+#  define NOTIFICATION_EXPORT __declspec( dllexport )
+# else
+#  define NOTIFICATION_EXPORT __declspec( dllimport )
+# endif
 #else
- #define NOTIFICATION_EXPORT
+# define NOTIFICATION_EXPORT
 #endif
 
 #endif

diff --git a/src/TOOLSDS/SALOMEDS_Tool.cxx b/src/TOOLSDS/SALOMEDS_Tool.cxx
index fcf2be69dad1e7c513e116a140d4d0f43adde91d..92f4ecae355a3b09dfa1760f0a4f5eac5b424564 100644 (file)
--- a/src/TOOLSDS/SALOMEDS_Tool.cxx
+++ b/src/TOOLSDS/SALOMEDS_Tool.cxx
@@ -27,13 +27,12 @@
 #include "SALOMEDS_Tool.hxx"
 
 #include "utilities.h"
+#include "Basics_DirUtils.hxx"
 
-#ifndef WNT
+#ifndef WIN32
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <iostream.h> 
-#include <fstream.h>
 #include <pwd.h> 
 #include <unistd.h>
 #else
@@ -41,6 +40,8 @@
 #include <lmcons.h>
 #endif
 
+#include <iostream> 
+#include <fstream>
 #include <stdlib.h>
 
 #include <SALOMEconfig.h>
@@ -50,9 +51,9 @@ using namespace std;
 
 bool Exists(const string thePath) 
 {
-#ifdef WNT 
+#ifdef WIN32 
   if (  GetFileAttributes (  thePath.c_str()  ) == 0xFFFFFFFF  ) { 
-    if (  GetLastError () != ERROR_FILE_NOT_FOUND  ) {
+    if (  GetLastError () == ERROR_FILE_NOT_FOUND  ) {
       return false;
     }
   }
@@ -70,9 +71,10 @@ bool Exists(const string thePath)
 //============================================================================ 
 std::string SALOMEDS_Tool::GetTmpDir()
 {
+  return Kernel_Utils::GetTmpDirByEnv("SALOME_TMP_DIR");
   //Find a temporary directory to store a file
 
-  string aTmpDir = "";
+  /*string aTmpDir = "";
 
   char *Tmp_dir = getenv("SALOME_TMP_DIR");
   if(Tmp_dir != NULL) {
@@ -116,13 +118,13 @@ std::string SALOMEDS_Tool::GetTmpDir()
 #endif
 
 
-#ifdef WNT
+#ifdef WIN32
   CreateDirectory(aDir.c_str(), NULL);
 #else
   mkdir(aDir.c_str(), 0x1ff); 
 #endif
 
-  return aDir;
+  return aDir;*/
 }
 
 //============================================================================
@@ -141,7 +143,7 @@ void SALOMEDS_Tool::RemoveTemporaryFiles(const std::string& theDirectory,
     aFile += theFiles[i-1];
     if(!Exists(aFile)) continue;
 
-#ifdef WNT
+#ifdef WIN32
     DeleteFile(aFile.c_str());
 #else 
     unlink(aFile.c_str());
@@ -150,8 +152,8 @@ void SALOMEDS_Tool::RemoveTemporaryFiles(const std::string& theDirectory,
 
   if(IsDirDeleted) {
     if(Exists(aDirName)) {
-#ifdef WNT
-      RemoveDirectory(aDireName.c_str());
+#ifdef WIN32
+      RemoveDirectory(aDirName.c_str());
 #else
       rmdir(aDirName.c_str());
 #endif
@@ -195,7 +197,7 @@ namespace
       if (!theNamesOnly) { // mpv 15.01.2003: if only file names must be stroed, then size of files is zero
        string aFullPath = aTmpDir + const_cast<char*>(theFiles[i].in());   
        if(!Exists(aFullPath)) continue;
-#ifdef WNT
+#ifdef WIN32
        ifstream aFile(aFullPath.c_str(), ios::binary);
 #else
        ifstream aFile(aFullPath.c_str());
@@ -229,7 +231,7 @@ namespace
       if (!theNamesOnly) { // mpv 15.01.2003: we don't open any file if theNamesOnly = true
        string aFullPath = aTmpDir + const_cast<char*>(theFiles[i].in());
        if(!Exists(aFullPath)) continue;
-#ifdef WNT
+#ifdef WIN32
        aFile = new ifstream(aFullPath.c_str(), ios::binary);
 #else
        aFile = new ifstream(aFullPath.c_str());
@@ -336,7 +338,7 @@ SALOMEDS_Tool::PutStreamToFiles(const SALOMEDS::TMPFile& theStream,
       aCurrentPos += 8;    
       
       string aFullPath = aTmpDir + aFileName;
-#ifdef WNT
+#ifdef WIN32
       ofstream aFile(aFullPath.c_str(), ios::binary);
 #else
       ofstream aFile(aFullPath.c_str());
@@ -407,8 +409,8 @@ std::string SALOMEDS_Tool::GetDirFromPath(const std::string& thePath) {
     path = thePath+"/";
   }
   
-#ifdef WNT  //Check if the only disk letter is given as path
-  if(path.size() == 2 && path[1] == ":") path +='\\';
+#ifdef WIN32  //Check if the only disk letter is given as path
+  if(path.size() == 2 && path[1] == ':') path +='\\';
 #endif
 
   for(int i = 0, len = path.size(); i<len; i++) 

diff --git a/src/TOOLSDS/SALOMEDS_Tool.hxx b/src/TOOLSDS/SALOMEDS_Tool.hxx
index 0c57ace2e93ba183939dda374aaa6b6c6368a7e0..ccddbec6784d0e17cff98f90827ba0809e42395e 100644 (file)
--- a/src/TOOLSDS/SALOMEDS_Tool.hxx
+++ b/src/TOOLSDS/SALOMEDS_Tool.hxx
@@ -35,22 +35,14 @@
 #include "SALOMEconfig.h"
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
-#ifdef WNT
- #if defined TOOLSDS_EXPORTS
-  #if defined WIN32
-   #define TOOLSDS_EXPORT __declspec( dllexport )
-  #else
-   #define TOOLSDS_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define TOOLSDS_EXPORT __declspec( dllimport )
-  #else
-   #define TOOLSDS_EXPORT
-  #endif
- #endif
+#ifdef WIN32
+# ifdef TOOLSDS_EXPORTS
+#  define TOOLSDS_EXPORT __declspec( dllexport )
+# else
+#  define TOOLSDS_EXPORT __declspec( dllimport )
+# endif
 #else
- #define TOOLSDS_EXPORT
+# define TOOLSDS_EXPORT
 #endif
 
 class TOOLSDS_EXPORT SALOMEDS_Tool                                
@@ -58,7 +50,7 @@ class TOOLSDS_EXPORT SALOMEDS_Tool
 public:
  
   // Returns the unique temporary directory, that is defined in SALOME_TMP_DIR if this variable is set
-  // otherwise return /tmp/something/ for Unix or c:\something\ for WNT
+  // otherwise return /tmp/something/ for Unix or c:\something\ for WIN32
   static std::string GetTmpDir();
 
  

diff --git a/src/TestContainer/Makefile.am b/src/TestContainer/Makefile.am
index 8101d8b2a11435b2634cba50cafacecf244ef46a..f158d2a62f3448aabd6d0159e04124c47f6cdb63 100644 (file)
--- a/src/TestContainer/Makefile.am
+++ b/src/TestContainer/Makefile.am
@@ -98,9 +98,11 @@ bin_PROGRAMS = TestContainer TestLogger
 TestContainer_SOURCES  = TestContainer.cxx
 TestContainer_CPPFLAGS = $(COMMON_CPPFLAGS)
 TestContainer_LDADD    = libSalomeTestComponentEngine.la \
+                        ../Basics/libSALOMEBasics.la \
                          $(CORBA_LIBS)
 
 TestLogger_SOURCES     = TestLogger.cxx
 TestLogger_CPPFLAGS    = $(COMMON_CPPFLAGS)
 TestLogger_LDADD       = libSalomeTestComponentEngine.la \
+                        ../Basics/libSALOMEBasics.la \
                          $(CORBA_LIBS)

diff --git a/src/TestContainer/SALOME_TestComponent_i.cxx b/src/TestContainer/SALOME_TestComponent_i.cxx
index a3a81c616cebd0a544ca804dd2a4f5edcb698f5c..2c598ae70ff7a3207571e3b8900b4cd1cc2ff49b 100644 (file)
--- a/src/TestContainer/SALOME_TestComponent_i.cxx
+++ b/src/TestContainer/SALOME_TestComponent_i.cxx
@@ -26,7 +26,7 @@
 //  Module : SALOME
 //  $Header$
 
-#ifndef WNT
+#ifndef WIN32
 # define private protected
 #endif
 #include "utilities.h"

diff --git a/src/TestContainer/TestContainer.cxx b/src/TestContainer/TestContainer.cxx
index 2a2f834ea25c11b2406b3ba6c5eaa7af725d2077..b8f4dfd572badad2a8dcc5a7c7d55998e064ec42 100644 (file)
--- a/src/TestContainer/TestContainer.cxx
+++ b/src/TestContainer/TestContainer.cxx
@@ -35,7 +35,7 @@
 
 #include "SALOME_NamingService.hxx"
 #include "NamingService_WaitForServerReadiness.hxx"
-#include "OpUtil.hxx"
+#include "Basics_Utils.hxx"
 #include "Utils_ORB_INIT.hxx"
 #include "Utils_SINGLETON.hxx"
 #include "Utils_SALOME_Exception.hxx"
@@ -91,7 +91,7 @@ int main (int argc, char * argv[])
     {
       SALOME_NamingService _NS(orb) ;
       string containerName = "/Containers/" ;
-      string hostName = GetHostname();
+      string hostName = Kernel_Utils::GetHostname();
       containerName += hostName + "/FactoryServer";
       NamingService_WaitForServerReadiness(&_NS,containerName);
 

diff --git a/src/TestMPIContainer/TestMPIContainer.cxx b/src/TestMPIContainer/TestMPIContainer.cxx
index fdc9f0e6be9a7cdaff619563b5a727226e871379..f1e3e4763f32256fddc8e421df59cc19b7ce002a 100644 (file)
--- a/src/TestMPIContainer/TestMPIContainer.cxx
+++ b/src/TestMPIContainer/TestMPIContainer.cxx
@@ -65,7 +65,7 @@ int main (int argc, char * argv[])
     // Use Name Service to find container
     SALOME_NamingService NS(orb) ;
     string containerName = "/Containers/" ;
-    string hostName = GetHostname();
+    string hostName = Kernel_Utils::GetHostname();
     containerName += hostName + "/MPIFactoryServer_" + argv[2];
 
     string dirn(getenv("KERNEL_ROOT_DIR"));

diff --git a/src/Utils/Makefile.am b/src/Utils/Makefile.am
index 5b3c3a37af2f6d3c937520e66a32bb3310924168..8c78e48a5b8066a807aea36a092f5338fd9fd564 100644 (file)
--- a/src/Utils/Makefile.am
+++ b/src/Utils/Makefile.am
@@ -52,7 +52,8 @@ dist_salomescript_DATA =\
 # Libraries targets
 lib_LTLIBRARIES = libOpUtil.la
 libOpUtil_la_SOURCES =\
-       OpUtil.cxx Utils_Timer.cxx duplicate.cxx \
+       Utils_Timer.cxx \
+       duplicate.cxx \
        Utils_CommException.cxx \
        Utils_SALOME_Exception.cxx \
        Utils_Identity.cxx Utils_ORB_INIT.cxx \

diff --git a/src/Utils/OpUtil.hxx b/src/Utils/OpUtil.hxx
index ba5d5eb421c99088b6d93c72455eb7120a771873..4e9cf4de12f4fb35bf390beb8acf75620f44d19f 100644 (file)
--- a/src/Utils/OpUtil.hxx
+++ b/src/Utils/OpUtil.hxx
@@ -27,11 +27,8 @@
 #ifndef _OPUTIL_HXX
 #define _OPUTIL_HXX
 
-#include <SALOME_Utils.hxx>
+#include "SALOME_Utils.hxx"
 
-#include <string>
-
-UTILS_EXPORT std::string GetHostname();
 UTILS_EXPORT const char *duplicate(const char * const);
 
 #endif

diff --git a/src/Utils/SALOME_Utils.hxx b/src/Utils/SALOME_Utils.hxx
index d6c28d278135d24c61e1cde7700f0a477d292078..3ae0e6f02145099cc0673cec06d6664937183456 100755 (executable)
--- a/src/Utils/SALOME_Utils.hxx
+++ b/src/Utils/SALOME_Utils.hxx
@@ -26,7 +26,7 @@
 #ifndef _SALOME_UTILS_HXX_
 #define _SALOME_UTILS_HXX_
 
-#ifdef WNT
+#ifdef WIN32
 # if defined UTILS_EXPORTS
 #  define UTILS_EXPORT __declspec( dllexport )
 # else

diff --git a/src/Utils/Utils_ExceptHandlers.hxx b/src/Utils/Utils_ExceptHandlers.hxx
index 8ac5aa8e5fd61e49388714b6e6bd514bbe00d534..ff40370f14abfa7676efb67f20e35bbd0cfcef55 100644 (file)
--- a/src/Utils/Utils_ExceptHandlers.hxx
+++ b/src/Utils/Utils_ExceptHandlers.hxx
@@ -29,7 +29,7 @@
 #ifndef Utils_ExceptHandlers_HeaderFile
 #define Utils_ExceptHandlers_HeaderFile
 
-#include <SALOME_Utils.hxx>
+#include "SALOME_Utils.hxx"
 
 #include <stdexcept>
 
@@ -38,7 +38,7 @@ typedef void (*PVF)();
 class UTILS_EXPORT Unexpect { //save / retrieve unexpected exceptions treatment
   PVF old;
   public :
-#ifndef WNT
+#ifndef WIN32
     Unexpect( PVF f ) 
       { old = std::set_unexpected(f); }
   ~Unexpect() { std::set_unexpected(old); }
@@ -53,7 +53,7 @@ class UTILS_EXPORT Terminate {//save / retrieve terminate function
   
   PVF old;
   public :
-#ifndef WNT
+#ifndef WIN32
     Terminate( PVF f ) 
       { old = std::set_terminate(f); }
   ~Terminate() { std::set_terminate(old); }

diff --git a/src/Utils/Utils_Identity.cxx b/src/Utils/Utils_Identity.cxx
index d95ea641cf9f831a2beecc7b568f6fd59fef7715..1c26a600ad80d68493d8ec42e41f4a44fb6f45a5 100644 (file)
--- a/src/Utils/Utils_Identity.cxx
+++ b/src/Utils/Utils_Identity.cxx
@@ -34,12 +34,12 @@ extern "C"
 {
 # include <string.h>
 
-#ifndef WNT /* unix functionality */
+#ifndef WIN32 /* unix functionality */
 # include <pwd.h>
 #endif
 }
 
-#ifndef WNT /* unix functionality */
+#ifndef WIN32 /* unix functionality */
 
 # include <arpa/inet.h>
 # include <netinet/in.h>
@@ -153,7 +153,7 @@ PSID getuid() {
 #define getcwd _getcwd
 #define getpid _getpid
 
-#endif /* WNT */
+#endif /* WIN32 */
 
 
 Identity::Identity( const char *name ):        _name(duplicate(name)),\
@@ -197,7 +197,7 @@ const char* const Identity::name (void) const
 {
        return  _name ;
 }
-#ifndef WNT
+#ifndef WIN32
        const pid_t& Identity::pid(void) const
 #else
        const DWORD& Identity::pid(void) const
@@ -206,7 +206,7 @@ const char* const Identity::name (void) const
        return _pid ;
 }
 
-#ifndef WNT
+#ifndef WIN32
         const struct utsname &Identity::hostid(void) const
 #else
         const char* const Identity::hostid(void) const
@@ -215,7 +215,7 @@ const char* const Identity::name (void) const
     return _hostid ;
 }
 
-#ifndef WNT
+#ifndef WIN32
        const uid_t& Identity::uid(void) const
 #else
        const PSID& Identity::uid(void) const
@@ -246,7 +246,7 @@ const char* const Identity::adip (void) const
 
 const char* Identity::host_char( void ) const
 {
-#ifndef WNT
+#ifndef WIN32
         return _hostid.nodename;
 #else
        return _hostid;
@@ -266,7 +266,7 @@ std::ostream & operator<< ( std::ostream& os , const Identity& monid )
        os << '\t' << "Numero de PID :  " << monid._pid << std::endl;
        os << '\t' << "Uid utilisateur  : "   << monid._uid << std::endl;
        os << '\t' << "nom utilisateur  : "   << monid._pwname << std::endl;
-#ifndef WNT
+#ifndef WIN32
        os << '\t' << "Nom de machine : " << monid._hostid.nodename << std::endl;
 #else
        os << '\t' << "Nom de machine : " << monid._hostid << std::endl;

diff --git a/src/Utils/Utils_Identity.hxx b/src/Utils/Utils_Identity.hxx
index 5e508a47ffd4660629baae61cf470499b2aa7d52..5bce751ff0ef4e33145d278cd60bd2c131081952 100644 (file)
--- a/src/Utils/Utils_Identity.hxx
+++ b/src/Utils/Utils_Identity.hxx
@@ -35,7 +35,7 @@ extern "C"
 {
 # include <stdlib.h>
 # include <time.h>
-#ifndef WNT
+#ifndef WIN32
 # include <unistd.h>
 # include <sys/utsname.h>
 #else
@@ -50,7 +50,7 @@ protected :
        const char* const       _name ;
        const char* const       _adip; // Internet address
 
-#ifndef WNT
+#ifndef WIN32
         const struct utsname    _hostid;        
        const pid_t             _pid ;
        const uid_t             _uid ;
@@ -73,7 +73,7 @@ public :
        ~Identity();
        friend std::ostream & operator<< ( std::ostream& os , const Identity& monid );
 
-#ifndef WNT
+#ifndef WIN32
        const pid_t&            pid(void) const;
         const struct utsname&  hostid(void) const;
        const uid_t&            uid(void) const;

diff --git a/src/Utils/Utils_Mutex.cxx b/src/Utils/Utils_Mutex.cxx
index 88a0c5747b1a38983614c0e669463302ceaca3f4..8fa7ec33c82a5dadfe92657a638e13c582570e17 100644 (file)
--- a/src/Utils/Utils_Mutex.cxx
+++ b/src/Utils/Utils_Mutex.cxx
@@ -45,7 +45,7 @@ void Utils_Mutex::lock()
 {
   pthread_mutex_lock( &myHelperMutex );
 
-#ifndef WNT 
+#ifndef WIN32 
   if ( myCount > 0 && myThread == pthread_self() ) {
 #else
   if ( myCount > 0 && myThread.p == pthread_self().p ) {
@@ -67,7 +67,7 @@ void Utils_Mutex::unlock()
 {
   pthread_mutex_lock( &myHelperMutex );
 
-#ifndef WNT  
+#ifndef WIN32  
   if ( myThread == pthread_self() ) {
 #else
   if ( myThread.p == pthread_self().p ) {

diff --git a/src/Utils/Utils_SALOME_Exception.cxx b/src/Utils/Utils_SALOME_Exception.cxx
index aacd15166c427d3f98092c4c8c03d2dc95793051..8f6faf2a521b11646e6140c2d79b679a233ed64e 100644 (file)
--- a/src/Utils/Utils_SALOME_Exception.cxx
+++ b/src/Utils/Utils_SALOME_Exception.cxx
@@ -30,14 +30,14 @@
 #include "Utils_SALOME_Exception.hxx"
 #include "utilities.h"
 
-#ifndef WNT
+#ifndef WIN32
 extern "C"
 {
 #endif
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
-#ifndef WNT
+#ifndef WIN32
 }
 #endif
 

diff --git a/src/Utils/Utils_SALOME_Exception.hxx b/src/Utils/Utils_SALOME_Exception.hxx
index 979b3e1378f2be7c87bbec799e5c8a8be9bfeadd..eeb9dc13cf4795c551cd27247e86e021428d96f3 100644 (file)
--- a/src/Utils/Utils_SALOME_Exception.hxx
+++ b/src/Utils/Utils_SALOME_Exception.hxx
@@ -46,8 +46,8 @@
 //swig tool on Linux doesn't pass defines from header SALOME_Utils.hxx
 //therefore (temporary solution) defines are placed below
 
-#ifdef WNT
-# if defined UTILS_EXPORTS
+#ifdef WIN32
+# ifdef UTILS_EXPORTS
 #  define UTILS_EXPORT __declspec( dllexport )
 # else
 #  define UTILS_EXPORT __declspec( dllimport )

diff --git a/src/Utils/Utils_Timer.cxx b/src/Utils/Utils_Timer.cxx
index e15c89a55f22ee0611b60d1f399c71f196bc6a01..41b90d24e936eb176a41c578ade3829b398b3c93 100644 (file)
--- a/src/Utils/Utils_Timer.cxx
+++ b/src/Utils/Utils_Timer.cxx
@@ -30,7 +30,7 @@
 
 #include "utilities.h"
 
-#ifndef WNT
+#ifndef WIN32
 static struct timezone *tz=(struct timezone*) malloc(sizeof(struct timezone));
 #else
 //timezone *tz=_timezone;
@@ -41,7 +41,7 @@ static struct timezone *tz=(struct timezone*) malloc(sizeof(struct timezone));
 #endif
 
 Utils_Timer::Utils_Timer() {
-#ifndef WNT
+#ifndef WIN32
   RefToInitialTMS = new tms;
   RefToCurrentTMS = new tms;
 
@@ -70,7 +70,7 @@ Utils_Timer::~Utils_Timer() {
 void Utils_Timer::Start() {
   if (Stopped) {
     Stopped = 0;
-#ifndef WNT
+#ifndef WIN32
     times(RefToInitialTMS);
     gettimeofday(RefToInitialTimeB,tz);
 #else
@@ -84,7 +84,7 @@ void Utils_Timer::Start() {
 
 void Utils_Timer::Stop() {
   if (!Stopped) {
-#ifndef WNT
+#ifndef WIN32
     times(RefToCurrentTMS);
     int diffr_user = RefToCurrentTMS->tms_utime - RefToInitialTMS->tms_utime;
     int diffr_sys  = RefToCurrentTMS->tms_stime - RefToInitialTMS->tms_stime;
@@ -119,7 +119,7 @@ void Utils_Timer::Reset() {
 
 void Utils_Timer::ShowAbsolute(){
 #if defined(_DEBUG_) || defined(_DEBUG)
-#ifndef WNT
+#ifndef WIN32
     unsigned long Absolute_user = (unsigned long) ((timeval*)RefToCurrentTimeB)->tv_sec ;
 #else
     unsigned long Absolute_user = *RefToCurrentTimeB;

diff --git a/src/Utils/Utils_Timer.hxx b/src/Utils/Utils_Timer.hxx
index a8363e0309f8238254111896a58389233e9f51b8..84edf590d986d3608fda1fc53920878874b17a6e 100644 (file)
--- a/src/Utils/Utils_Timer.hxx
+++ b/src/Utils/Utils_Timer.hxx
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-#ifndef WNT
+#ifndef WIN32
 # include <sys/times.h>
 # include <sys/time.h>
 # include <unistd.h>
@@ -53,7 +53,7 @@ class UTILS_EXPORT Utils_Timer {
   double Cumul_user;
   double Cumul_sys;
   bool Stopped;
-#ifndef WNT
+#ifndef WIN32
   tms *RefToCurrentTMS, *RefToInitialTMS;
   timeval *RefToCurrentTimeB, *RefToInitialTimeB;
 #else