Remove some warnings in windows compilation ...

diff --git a/src/Basics/BasicsGenericDestructor.hxx b/src/Basics/BasicsGenericDestructor.hxx
index 5b76c7380aa43753b0a4cdbde3a92c6fb0823593..189c4441bbfe37afef68ac8864e7c1e00514783a 100644 (file)
--- a/src/Basics/BasicsGenericDestructor.hxx
+++ b/src/Basics/BasicsGenericDestructor.hxx
@@ -48,6 +48,10 @@
 #define DEVTRACE(msg)
 #endif
 
+#ifdef WNT
+#pragma warning(disable:4251) // Warning DLL Interface ...
+#endif
+
 // ============================================================================
 /*!
  * The PROTECTED_DELETE base class provides a protected destructor. 

diff --git a/src/Basics/Basics_DirUtils.cxx b/src/Basics/Basics_DirUtils.cxx
index 613368ba06d3063051b83b4ecf23cd565d602429..a666317ed1734ac696c87a691ffed09a4b3e9e47 100644 (file)
--- a/src/Basics/Basics_DirUtils.cxx
+++ b/src/Basics/Basics_DirUtils.cxx
@@ -50,7 +50,7 @@ namespace Kernel_Utils
   {
     int pos = file_path.rfind( _separator_ );
     if ( pos >= 0 )
-      return pos < file_path.size()-1 ? file_path.substr( pos+1 ) : "";
+      return pos < (int)file_path.size()-1 ? file_path.substr( pos+1 ) : "";
     return file_path;
   }
 
@@ -181,14 +181,14 @@ namespace Kernel_Utils
     string::size_type length = path.length();
 
     //detect all separators in Unix format
-    for ( int i = 0; i < length; i++ )
+    for ( unsigned int i = 0; i < length; i++ )
     {
       if( path[i] == '/' )
         path[i] = '|';
     }
 
     //detect all separators in Windows format
-    for ( int i = 0; i < length; i++ )
+    for ( unsigned int i = 0; i < length; i++ )
     {
       if( path[i] == '\\' )
         path[i] = '|';
@@ -214,7 +214,7 @@ namespace Kernel_Utils
     }
 
     length = path.length();
-    for ( int i = 0; i < length; i++ )
+    for ( unsigned int i = 0; i < length; i++ )
     {
       if( path[i] == '|' )
         path[i] = _separator_;

diff --git a/src/DF/DF_ChildIterator.cxx b/src/DF/DF_ChildIterator.cxx
index 834c361596d8816affbae7e6df2661fed87867f0..a7b73c6f6b6ac488215250df60f8ea72bf560da1 100644 (file)
--- a/src/DF/DF_ChildIterator.cxx
+++ b/src/DF/DF_ChildIterator.cxx
@@ -59,7 +59,7 @@ DF_Label DF_ChildIterator::Value()
 //Returns true if there is a current Label
 bool DF_ChildIterator::More()
 {
-  return bool(_current);
+  return _current!=0;
 }
 
 //Moves to the next Label

diff --git a/src/DF/DF_Label.cxx b/src/DF/DF_Label.cxx
index f83d1521c1de563bc7bd669a66b75dc6788042d3..c26b891d1d18783837198323e1bd467131d9bea2 100644 (file)
--- a/src/DF/DF_Label.cxx
+++ b/src/DF/DF_Label.cxx
@@ -136,7 +136,7 @@ int DF_Label::Tag() const
 bool DF_Label::IsAttached()
 {
   if(!_node) return false;
-  return (bool)(_node->_document);
+  return _node->_document != 0;
 }
 
 //Searches an Attribute with given ID located on this Label.
@@ -261,7 +261,7 @@ bool DF_Label::HasChild() const
 {
   if(!_node) return false;
 
-  return (bool)(_node->_firstChild);
+  return _node->_firstChild != 0;
 }
 
 //Returns a number of child Labels.

diff --git a/src/DF/testDF.cxx b/src/DF/testDF.cxx
index c73c20d5bb95aa9d1f3d20e57cf3ed549aa10344..1e44603f3c338dfb76978191bc735153e93d29aa 100644 (file)
--- a/src/DF/testDF.cxx
+++ b/src/DF/testDF.cxx
@@ -43,8 +43,8 @@
 #include <pwd.h>
 #else
 #include <time.h>
-#include <lmcons.h>
 #include <windows.h>
+#include <lmcons.h>
 #endif
 
 using namespace std;

diff --git a/src/GenericObj/SALOME_GenericObj_i.hh b/src/GenericObj/SALOME_GenericObj_i.hh
index a7f03c893d117ec829aa03865fa7cb7f1e6c13fc..6dcedcf2d4e8048e2960e305aa43d053980d3301 100644 (file)
--- a/src/GenericObj/SALOME_GenericObj_i.hh
+++ b/src/GenericObj/SALOME_GenericObj_i.hh
@@ -41,6 +41,11 @@
 # define GENERICOBJ_EXPORT
 #endif
 
+#ifdef WNT
+#pragma warning(disable:4275) // Disable warning interface non dll
+#pragma warning(disable:4251) // Warning DLL Interface ...
+#endif
+
 namespace SALOME{
   class GENERICOBJ_EXPORT GenericObj_i : 
     public virtual POA_SALOME::GenericObj,

diff --git a/src/HDFPersist/HDFascii.cc b/src/HDFPersist/HDFascii.cc
index 17642df5b0155c47fdcbf563599eb908b2b5ca84..33750e60959ba02b6142845c1de87125a5977439 100644 (file)
--- a/src/HDFPersist/HDFascii.cc
+++ b/src/HDFPersist/HDFascii.cc
@@ -37,6 +37,9 @@
 #include <io.h>
 #include <time.h>
 #include <windows.h>
+#define open _open
+#define read _read
+#define close _close
 #define dir_separator '\\'
 #else
 #define dir_separator '/'
@@ -125,7 +128,7 @@ char* HDFascii::ConvertFromHDFToASCII(const char* thePath,
   fprintf(fp, "%s\n", ASCIIHDF_ID);
   fprintf(fp, "%i\n", nbsons+nbAttr);
 
-  for(unsigned j=0; j<nbAttr; j++) {
+  for(int j=0; j<nbAttr; j++) {
     char* attr_name = hdf_file->GetAttributeName(j);
     HDFattribute *hdf_attribute = new HDFattribute(attr_name, hdf_file);
     delete attr_name;
@@ -189,7 +192,7 @@ void SaveGroupInASCIIfile(HDFgroup *hdf_group, FILE* fp, int ident)
   fprintf(fp, "%s %i\n", name, nbsons+nbAttr);
   delete [] name;
 
-  for(unsigned j=0; j<nbAttr; j++) {
+  for(int j=0; j<nbAttr; j++) {
     name = hdf_group->GetAttributeName(j);
     HDFattribute *hdf_attribute = new HDFattribute(name, hdf_group);
     delete [] name;
@@ -230,7 +233,7 @@ void SaveDatasetInASCIIfile(HDFdataset *hdf_dataset, FILE* fp, int ident)
 {
   hdf_dataset->OpenOnDisk();
 
-  long size =  hdf_dataset->GetSize();
+  long size =  (long) hdf_dataset->GetSize();
   long ndim = hdf_dataset->nDim(); //Get number of dimesions
   hdf_size *dim = new hdf_size[ndim];
   hdf_type type = hdf_dataset->GetType();
@@ -301,7 +304,7 @@ void SaveDatasetInASCIIfile(HDFdataset *hdf_dataset, FILE* fp, int ident)
   
   fprintf(fp, "\n");
 
-  for ( unsigned j=0; j<nbAttr; j++ )
+  for ( int j=0; j<nbAttr; j++ )
   {
     name = hdf_dataset->GetAttributeName(j);
     HDFattribute *hdf_attribute = new HDFattribute(name, hdf_dataset);

diff --git a/src/HDFPersist/HDFconvert.cc b/src/HDFPersist/HDFconvert.cc
index 7fe03f8873031d100c1a058f66937b4254b58df1..fca5439194b691fee163a5460513b4f9f516850e 100644 (file)
--- a/src/HDFPersist/HDFconvert.cc
+++ b/src/HDFPersist/HDFconvert.cc
@@ -29,6 +29,8 @@ using namespace std;
 #ifdef WIN32
 #include <io.h>
 #include <windows.h>
+#define open _open
+#define close _close
 #endif
 
 int HDFConvert::FromAscii(const string& file, const HDFcontainerObject & hdf_container, const string& nomdataset)

diff --git a/src/HDFPersist/HDFdataset.cc b/src/HDFPersist/HDFdataset.cc
index 627609a298f38ac81728461cbae23b928bf29f30..790e3d065437c607812e69c240f3c4dbb56bb5c9 100644 (file)
--- a/src/HDFPersist/HDFdataset.cc
+++ b/src/HDFPersist/HDFdataset.cc
@@ -166,7 +166,7 @@ void HDFdataset::GetDim(hdf_size dim[])
     dim[i] = _dim[i];
 }
 
-int HDFdataset::GetSize()
+hdf_size HDFdataset::GetSize()
 {
   int size_type;
 

diff --git a/src/HDFPersist/HDFdataset.hxx b/src/HDFPersist/HDFdataset.hxx
index a221f8ca0309711cfdbe172c3d2840c5cca4723d..c489b0dbcf6d5ea6f4d7cd9418da2b2d7f8ed287 100644 (file)
--- a/src/HDFPersist/HDFdataset.hxx
+++ b/src/HDFPersist/HDFdataset.hxx
@@ -42,7 +42,7 @@ private :
   hdf_type _type;
   hdf_size *_dim;
   hdf_byte_order _byte_order;
-  int _size;
+  hdf_size _size;
   int _ndim;
   char* _attribute;
 
@@ -64,7 +64,7 @@ public:
   hdf_type GetType();
   int nDim();
   void GetDim(hdf_size dim[]);
-  int GetSize();
+  hdf_size GetSize();
   hdf_object_type GetObjectType();
   hdf_byte_order GetOrder();
 

diff --git a/src/HDFPersist/HDFfile.cc b/src/HDFPersist/HDFfile.cc
index b0e8ac60573050d7f5d0a881b44cb93ef22ac190..453098c2680cb96f1036c2680c74af572af71768 100644 (file)
--- a/src/HDFPersist/HDFfile.cc
+++ b/src/HDFPersist/HDFfile.cc
@@ -31,6 +31,7 @@ extern "C"
 #else
 #include <io.h>
 #define F_OK 0
+#define access _access
 #endif
 #include <string.h>
 }

diff --git a/src/HDFPersist/HDFobject.cc b/src/HDFPersist/HDFobject.cc
index 0686a6c73f9fa78423649afd70555be9dc8fdcf9..ae73587840afa3ec7dbc86a00bb9583370441252 100644 (file)
--- a/src/HDFPersist/HDFobject.cc
+++ b/src/HDFPersist/HDFobject.cc
@@ -33,6 +33,10 @@ extern "C"
 #include <stdlib.h>
 using namespace std;
 
+#ifdef WNT
+#define strdup _strdup
+#endif
+
 HDFobject::HDFobject(const char *name)
 {
   HDFerrorModeLock();

diff --git a/src/Logger/SALOME_Logger_Server.hxx b/src/Logger/SALOME_Logger_Server.hxx
index 8c9f19d5c13f5c7ba4a033cd88cebc23de4b1e87..d1ceedd35191492b6aca3d7aa6d2e94bb2c9dac9 100644 (file)
--- a/src/Logger/SALOME_Logger_Server.hxx
+++ b/src/Logger/SALOME_Logger_Server.hxx
@@ -46,6 +46,9 @@
 # define LOGGER_EXPORT
 #endif
 
+#ifdef WNT
+#pragma warning(disable:4275) // Disable warning interface non dll
+#endif
 
 class LOGGER_EXPORT Logger :
   public POA_SALOME_Logger::Logger

diff --git a/src/Logger/SALOME_Logger_Server_main.cxx b/src/Logger/SALOME_Logger_Server_main.cxx
index 70d072fa10bc39acdf564d44d96a3e3a04771ac3..459bb7fd27234eab9289087f37a8038062623a97 100644 (file)
--- a/src/Logger/SALOME_Logger_Server_main.cxx
+++ b/src/Logger/SALOME_Logger_Server_main.cxx
@@ -114,7 +114,7 @@ int main(int argc, char **argv)
       orb->run() ;
       orb->destroy() ;
     }  
-  catch(CORBA::COMM_FAILURE& ex)
+  catch(CORBA::COMM_FAILURE&)
         {
       std::cerr << "Caught system exception COMM_FAILURE -- unable to contact the "
            << "object." << std::endl;

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx
index 59a442b2d0668192fe054192eeb81469de5d32d0..dd385066936de84d60832c78ea8e89d63e0f5ed0 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx
@@ -35,6 +35,11 @@
 
 #include CORBA_SERVER_HEADER(SALOME_ModuleCatalog)
 
+#ifdef WNT
+#pragma warning(disable:4275) // Disable warning interface non dll
+#pragma warning(disable:4290) // Warning Exception ...
+#endif
+
 class MODULECATALOG_EXPORT SALOME_ModuleCatalog_AcomponentImpl: public POA_SALOME_ModuleCatalog::Acomponent
 {
 public:

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Client.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Client.cxx
index ab2f3629e686211a3419ac402d94d06a59c475fb..47813f8eb0452cc63ae106e0a44cf047890874fe 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Client.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Client.cxx
@@ -141,7 +141,7 @@ int main(int argc,char **argv)
       INFOS("CosNaming::NamingContext::NotEmpty")
   }
 
-  catch(CORBA::Exception &sysEx) {
+  catch(CORBA::Exception &) {
     INFOS("Caught CORBA::Exception.")
   }
 

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
index e794d0b034d63ff04be6f09aca0f137fa5d47b94..172de389864022ff630a76b72b4d7f37f48dee36 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
@@ -479,7 +479,7 @@ void SALOME_ModuleCatalog_Handler::ProcessXmlDocument(xmlDocPtr theDoc)
 
           // Tag test_component_multistudy
           if ( !xmlStrcmp(aComponentSubNode->name, (const xmlChar*)test_component_multistudy) )
-            _aModule.multistudy = atoi( aContent.c_str() );
+            _aModule.multistudy = atoi( aContent.c_str() ) != 0;
 
           // Tag test_component_impltype
           if ( !xmlStrcmp(aComponentSubNode->name, (const xmlChar*)test_component_impltype) )
@@ -542,11 +542,11 @@ void SALOME_ModuleCatalog_Handler::ProcessXmlDocument(xmlDocPtr theDoc)
 
                         // Tag test_defaultservice
                         if ( !xmlStrcmp(aCompServiceSubNode->name, (const xmlChar*)test_defaultservice) )
-                          _aService.byDefault = (bool)(atoi((const char*)aCompServiceData));
+                          _aService.byDefault = atoi((const char*)aCompServiceData) !=0 ;
 
                         // Tag test_typeofnode
                         if ( !xmlStrcmp(aCompServiceSubNode->name, (const xmlChar*)test_typeofnode) )
-                          _aService.typeOfNode = (bool)(atoi((const char*)aCompServiceData));;
+                          _aService.typeOfNode = atoi((const char*)aCompServiceData) !=0 ;
 
                         xmlFree(aCompServiceData);
                       }

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx
index 2e6eaff655bd67d1be3ad08a9fb0bda3d1ef04bb..21f3e590046671e51c3b7d33d268ef276638572a 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx
@@ -38,6 +38,10 @@
 
 #include <libxml/parser.h>
 
+#ifdef WNT
+#pragma warning(disable:4251) // Warning DLL Interface ...
+#endif
+
 class MODULECATALOG_EXPORT SALOME_ModuleCatalog_Handler
 {
 public:

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
index 34f97a5c5d761e753bb85f1df9d29542d2b95342..906f7754398e7d733843b3056ea9c9e2ba71b786 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
@@ -48,7 +48,9 @@ int main(int argc,char **argv)
       //
       long TIMESleep = 500000000;
       int NumberOfTries = 40;
+#ifndef WIN32
       int a;
+#endif
       timespec ts_req;
       ts_req.tv_nsec=TIMESleep;
       ts_req.tv_sec=0;

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
index d0c2e7bb973d57a9a24826a627f1881e8d01f80e..6f8f9b34fc578c6c0cd930f41cab4a0bf27f164e 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
@@ -211,7 +211,7 @@ SALOME_ModuleCatalog::ListOfTypeDefinition* SALOME_ModuleCatalogImpl::GetTypes()
   SALOME_ModuleCatalog::ListOfTypeDefinition_var type_list = new SALOME_ModuleCatalog::ListOfTypeDefinition();
   type_list->length(_typeList.size());
 
-  for (int ind = 0 ; ind < _typeList.size() ; ind++)
+  for (unsigned int ind = 0 ; ind < _typeList.size() ; ind++)
     {
       //no real need to call string_dup, omniorb calls it on operator= (const char *) but it is safer
       type_list[ind].name=CORBA::string_dup(_typeList[ind].name.c_str());

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx
index 9017dfcf872b1e3f67175a230a7b6c65fc088cc3..553665ea055a1b4e87a31942497806387f589fa1 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx
@@ -38,6 +38,11 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_ModuleCatalog)
 
+#ifdef WNT
+#pragma warning(disable:4275) // Disable warning interface non dll
+#pragma warning(disable:4290) // Warning Exception ...
+#endif
+
 class MODULECATALOG_EXPORT SALOME_ModuleCatalogImpl: public POA_SALOME_ModuleCatalog::ModuleCatalog
 {
 public:

diff --git a/src/NamingService/SALOME_NamingService.cxx b/src/NamingService/SALOME_NamingService.cxx
index ce4986933640f2d6c893f6ebcb92f426dc4e7205..03c2a43d40b0cab78feddf97abb707117dff3b73 100644 (file)
--- a/src/NamingService/SALOME_NamingService.cxx
+++ b/src/NamingService/SALOME_NamingService.cxx
@@ -35,6 +35,10 @@
 #include <string>
 #include <cstdio>
 
+#ifdef WNT
+#define strdup _strdup
+#endif
+
 using namespace std;
 
 /*! \class SALOME_NamingService

diff --git a/src/NamingService/SALOME_NamingService.hxx b/src/NamingService/SALOME_NamingService.hxx
index fbbc3601d68374d36331e85f0d581383eb8465e8..0be8b6cc45e8b3dd8f868b77f1d4b679fcc724f6 100644 (file)
--- a/src/NamingService/SALOME_NamingService.hxx
+++ b/src/NamingService/SALOME_NamingService.hxx
@@ -40,6 +40,10 @@
 
 #include "SALOME_NamingService_defs.hxx"
 
+#ifdef WNT
+#pragma warning(disable:4290) // Warning Exception ...
+#endif
+
 class NAMINGSERVICE_EXPORT SALOME_NamingService
 {
 public:

diff --git a/src/Notification/NOTIFICATION.cxx b/src/Notification/NOTIFICATION.cxx
index d1dbcd1108ec7242885347b034c8b710c958d491..d2f083a788e4088ea2a6557c81b667d4dd59f0ee 100644 (file)
--- a/src/Notification/NOTIFICATION.cxx
+++ b/src/Notification/NOTIFICATION.cxx
@@ -46,10 +46,10 @@ CosNA_EventChannel_ptr NOTIFICATION_channel() {
             MESSAGE("NOTIFICATION Error : failed to obtain context for NameService");
             return(channel);
         };
-    } catch(CORBA::ORB::InvalidName& ex) {
+    } catch(CORBA::ORB::InvalidName& ) {
         MESSAGE("NOTIFICATION Error : service required is invalid [does not exist]");
         return(channel);
-    } catch (CORBA::SystemException& ex) {
+    } catch (CORBA::SystemException& ) {
         MESSAGE("NOTIFICATION Error : caught system exception COMM_FAILURE");
         return(channel);
     } catch (...) {
@@ -67,9 +67,9 @@ CosNA_EventChannel_ptr NOTIFICATION_channel() {
         if (CORBA::is_nil(channel)) {
             MESSAGE("NOTIFICATION Error : failed to narrow object found in naming service");
         };
-    } catch(CORBA::ORB::InvalidName& ex) {
+    } catch(CORBA::ORB::InvalidName& ) {
         MESSAGE("NOTIFICATION Error : invalid name");
-    } catch (CORBA::SystemException& ex) {
+    } catch (CORBA::SystemException& ) {
         MESSAGE("NOTIFICATION Error : caught system exception COMM_FAILURE while resolving event channel name");
     } catch (...) {
         MESSAGE("NOTIFICATION Error : caught exception while resolving event channel name");

diff --git a/src/Notification/NOTIFICATION_Consumer.cxx b/src/Notification/NOTIFICATION_Consumer.cxx
index d9ab866c75da53a58a5651ed5fa9b141c589e071..0c60660f3d67ba06f7b424f7750d3ff4de756b43 100644 (file)
--- a/src/Notification/NOTIFICATION_Consumer.cxx
+++ b/src/Notification/NOTIFICATION_Consumer.cxx
@@ -50,9 +50,9 @@ NOTIFICATION_Consumer::NOTIFICATION_Consumer():
                     proxy_supplier->connect_structured_pull_consumer(_this());
                     _ok = true;
                     MESSAGE("NOTIFICATION Info : successfully connection for pull consumer notification");
-                } catch (CORBA::BAD_PARAM& ex) {
+                } catch (CORBA::BAD_PARAM&) {
                     MESSAGE("NOTIFICATION Error : pull consumer BAD_PARAM exception while connecting");
-                } catch (CosEventChannelAdmin::AlreadyConnected& ex) {
+                } catch (CosEventChannelAdmin::AlreadyConnected&) {
                     MESSAGE("NOTIFICATION Error : pull consumer already connected");
                 } catch (...) {
                     MESSAGE("NOTIFICATION Error : pull consumer failed to connect");

diff --git a/src/Notification/NOTIFICATION_Supplier.cxx b/src/Notification/NOTIFICATION_Supplier.cxx
index 00a214d9fd7c0bbeef10055df3b802a6f11d277b..ae094ff61ff733a1e7d498ea36a19da52752e2b4 100644 (file)
--- a/src/Notification/NOTIFICATION_Supplier.cxx
+++ b/src/Notification/NOTIFICATION_Supplier.cxx
@@ -55,9 +55,9 @@ NOTIFICATION_Supplier::NOTIFICATION_Supplier(const char* instanceName, bool noti
                         proxy_consumer->connect_structured_push_supplier(_this());
                         _ok = true;
                         MESSAGE("NOTIFICATION Info : successfully connection for push supplier notification");
-                    } catch (CORBA::BAD_PARAM& ex) {
+                    } catch (CORBA::BAD_PARAM&) {
                         MESSAGE("NOTIFICATION Error : push supplier BAD_PARAM Exception while connecting");
-                    } catch (CosEventChannelAdmin::AlreadyConnected& ex) {
+                    } catch (CosEventChannelAdmin::AlreadyConnected&) {
                         MESSAGE("NOTIFICATION Error : push supplier already connected");
                     } catch (...) {
                         MESSAGE("NOTIFICATION Error : push supplier failed to connect");

diff --git a/src/Notification/NOTIFICATION_Supplier.hxx b/src/Notification/NOTIFICATION_Supplier.hxx
index 1dccf5c5080b83605b867f2f48f7d657258afdba..66fa0b2621315e01574dc73fc2547c06815121a0 100644 (file)
--- a/src/Notification/NOTIFICATION_Supplier.hxx
+++ b/src/Notification/NOTIFICATION_Supplier.hxx
@@ -29,6 +29,10 @@
 
 #include "SALOME_NOTIFICATION.hxx"
 
+#ifdef WNT
+#pragma warning(disable:4275) // Disable warning interface non dll
+#endif
+
 class NOTIFICATION_EXPORT NOTIFICATION_Supplier: public POA_CosNotifyComm::StructuredPushSupplier {
   public:
     NOTIFICATION_Supplier(const char* instanceName, bool notif);

diff --git a/src/Registry/RegistryService.cxx b/src/Registry/RegistryService.cxx
index 0dd569c61ff2b70c0914a211eb54dc50ef6820ea..a3324c52df2f434dc434002bea54f22f663c8eca 100644 (file)
--- a/src/Registry/RegistryService.cxx
+++ b/src/Registry/RegistryService.cxx
@@ -38,6 +38,7 @@ extern "C"
 #include <unistd.h>
 #else
 #include <process.h>
+#define getpid _getpid
 #endif
 using namespace std;
 

diff --git a/src/Registry/RegistryService.hxx b/src/Registry/RegistryService.hxx
index 89a5a733e94910d1c9fab7607e1d14740ff20cb8..c25ac622a9838c71fdc004113b00bc1038181dcd 100644 (file)
--- a/src/Registry/RegistryService.hxx
+++ b/src/Registry/RegistryService.hxx
@@ -35,6 +35,11 @@
 
 # include <map>
 
+#ifdef WNT
+#pragma warning(disable:4275) // Disable warning interface non dll
+#pragma warning(disable:4251) // Warning DLL Interface ...
+#endif
+
 class REGISTRY_EXPORT RegistryService : public POA_Registry::Components  //, public PortableServer::RefCountServantBase
 {
 

diff --git a/src/Registry/SALOME_Registry_Server.cxx b/src/Registry/SALOME_Registry_Server.cxx
index cf637665ee680cc7bef8cc820e756c64160ba15b..23cc25d3c949489f92167393a03ae78de2f5f575 100644 (file)
--- a/src/Registry/SALOME_Registry_Server.cxx
+++ b/src/Registry/SALOME_Registry_Server.cxx
@@ -77,7 +77,9 @@ int main( int argc , char **argv )
   const char *registryName = "Registry" ;
   long TIMESleep = 250000000;
   int NumberOfTries = 40;
+#ifndef WIN32
   int a;
+#endif
   timespec ts_req;
   ts_req.tv_nsec=TIMESleep;
   ts_req.tv_sec=0;
@@ -179,10 +181,10 @@ int main( int argc , char **argv )
           MESSAGE("RegistryService servant already existing" ) ;
           exit( EXIT_FAILURE ) ;
         }
-      catch( const ServiceUnreachable &ex )
+      catch( const ServiceUnreachable & )
         {
         }
-      catch( const CORBA::Exception &exx )
+      catch( const CORBA::Exception & )
         {
         }
       string absoluteName = string("/") + registryName;
@@ -205,7 +207,7 @@ int main( int argc , char **argv )
 #endif
           orb->run() ;
         }
-      catch( const CORBA::Exception &ex )
+      catch( const CORBA::Exception & )
         {
           MESSAGE("System error") ;
           return EXIT_FAILURE ;

diff --git a/src/ResourcesManager/ResourcesManager.hxx b/src/ResourcesManager/ResourcesManager.hxx
index 1afcf69a55e2b42e8b948559e28862cf3a773462..ba6f593f9d169fbf6e4aa96530f5bcd948f9c82d 100644 (file)
--- a/src/ResourcesManager/ResourcesManager.hxx
+++ b/src/ResourcesManager/ResourcesManager.hxx
@@ -38,6 +38,11 @@
 #include <unistd.h>
 #endif
 
+#ifdef WNT
+#pragma warning(disable:4251) // Warning DLL Interface ...
+#pragma warning(disable:4290) // Warning Exception ...
+#endif
+
 // --- WARNING ---
 // The call of BuildTempFileToLaunchRemoteContainer and RmTmpFile must be done
 // in a critical section to be sure to be clean.

diff --git a/src/ResourcesManager/SALOME_LoadRateManager.cxx b/src/ResourcesManager/SALOME_LoadRateManager.cxx
index c422a3fd0efe8ea41ad13e0d3b582b21a667b11f..c525503307f9d6f2f4fb755cd54f74024b290c95 100644 (file)
--- a/src/ResourcesManager/SALOME_LoadRateManager.cxx
+++ b/src/ResourcesManager/SALOME_LoadRateManager.cxx
@@ -54,7 +54,7 @@ string LoadRateManagerCycl::Find(const vector<string>& hosts,
     else{
       iproc = 1;
       imachine++;
-      if(imachine >= hosts.size())
+      if(imachine >= (int)hosts.size())
         imachine = 0;
       return string(hosts[imachine]);
     }

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
index ae1d56ffe451907e57b59176b1de0c4d6bc578bc..261860b5937bb0d97de7f41db58a7999fd2a0d32 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
@@ -154,7 +154,7 @@ void ParserResourcesType::Print()
     "Modules : " << endl <<
     "Components : " << endl;
 
-  for(int i=0;i<ComponentsList.size();i++)
+  for(unsigned int i=0;i<ComponentsList.size();i++)
     oss << "Component " << i+1 << " called : " << ComponentsList[i] << endl;
 
   

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
index 908505483d1aafaddf7bc177f86c3861bda90582..97fc1cf28248aad0eaa5354496818f9c750c2713 100755 (executable)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
@@ -36,6 +36,10 @@
 #include <map>
 #include <iostream>
 
+#ifdef WNT
+#pragma warning(disable:4251) // Warning DLL Interface ...
+#endif
+
 enum AccessProtocolType {rsh, ssh};
 
 enum AccessModeType {interactive, batch};

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.hxx b/src/ResourcesManager/SALOME_ResourcesManager.hxx
index e69f733bbd7f7376b784916a2c990cf940c821db..715e7626eced808ac529d8cdf60e09ab2bcc4eb9 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.hxx
@@ -45,6 +45,10 @@
 # define SALOMERESOURCESMANAGER_EXPORT
 #endif
 
+#ifdef WNT
+#pragma warning(disable:4275) // Disable warning interface non dll
+#endif
+
 // --- WARNING ---
 // The call of BuildTempFileToLaunchRemoteContainer and RmTmpFile must be done
 // in a critical section to be sure to be clean.

diff --git a/src/Utils/Utils_ORB_INIT.cxx b/src/Utils/Utils_ORB_INIT.cxx
index 5c59da51b381052f9eb90f47d339894161f2d947..884cc90d4cd9b396d1421d9f2f1a7ea799bb8fd4 100644 (file)
--- a/src/Utils/Utils_ORB_INIT.cxx
+++ b/src/Utils/Utils_ORB_INIT.cxx
@@ -67,7 +67,7 @@ CORBA::ORB_var &ORB_INIT::operator() ( int argc , char **argv ) throw( CommExcep
             _orb = CORBA::ORB_init( argc, argv, "omniORB3" ) ;
 #endif
           }
-        catch( const CORBA::Exception &ex )
+        catch( const CORBA::Exception & )
           {
             throw CommException( "Unable to create an ORB connexion" ) ;
           }

diff --git a/src/Utils/Utils_ORB_INIT.hxx b/src/Utils/Utils_ORB_INIT.hxx
index 73316217a376851f704de1c9dfd0f5a37e825cb2..7458dc8db15c3e44d06e3b44c60041e5f78216f2 100644 (file)
--- a/src/Utils/Utils_ORB_INIT.hxx
+++ b/src/Utils/Utils_ORB_INIT.hxx
@@ -36,6 +36,11 @@
 
 #include "Utils_CommException.hxx"
 
+#ifdef WNT
+#pragma warning(disable:4251) // Warning DLL Interface ...
+#pragma warning(disable:4290) // Warning Exception ...
+#endif
+
 /*!
  * Ce composant prend en charge la connexion et la deconnexion a l'orb
  * Il est souhaitable de l'utiliser dans un SINGLETON.

diff --git a/src/Utils/Utils_SALOME_Exception.hxx b/src/Utils/Utils_SALOME_Exception.hxx
index 3959e904cdcfc62562d8d2fd08fa0f3ef004bbf6..b6b2d54a3a815ddc594aa80450c9a6b1dfe4d50f 100644 (file)
--- a/src/Utils/Utils_SALOME_Exception.hxx
+++ b/src/Utils/Utils_SALOME_Exception.hxx
@@ -50,6 +50,7 @@
 #  define UTILS_EXPORT __declspec( dllexport )
 # else
 #  define UTILS_EXPORT __declspec( dllimport )
+#  undef LOCALIZED
 #  define LOCALIZED(message) #message
 # endif
 #else
@@ -75,7 +76,7 @@ public :
         SALOME_Exception( const char *text, const char *fileName=0, const unsigned int lineNumber=0 );
         SALOME_Exception( const SALOME_Exception &ex );
         virtual ~SALOME_Exception() throw ();
-        friend std::ostream & operator<<( std::ostream &os , const SALOME_Exception &ex );
+        UTILS_EXPORT friend std::ostream & operator<<( std::ostream &os , const SALOME_Exception &ex );
         virtual const char *what( void ) const throw () ;
 } ;
 

diff --git a/src/Utils/Utils_Timer.cxx b/src/Utils/Utils_Timer.cxx
index 8c1716ef0f13163575e6d3b783bb441d1025c4fa..7c2ace79b1cc6e086e6b21990230d5a91489c1c8 100644 (file)
--- a/src/Utils/Utils_Timer.cxx
+++ b/src/Utils/Utils_Timer.cxx
@@ -121,7 +121,7 @@ void Utils_Timer::ShowAbsolute(){
 #ifndef WIN32
     unsigned long Absolute_user = (unsigned long) ((timeval*)RefToCurrentTimeB)->tv_sec ;
 #else
-    unsigned long Absolute_user = *RefToCurrentTimeB;
+    unsigned long Absolute_user = (unsigned long) *RefToCurrentTimeB;
 #endif
     MESSAGE("Absolute time: "   << Absolute_user  << " seconds ");
 #endif