fix warning "unused variable" and "possible loss of data"

diff --git a/src/Container/Component_i.cxx b/src/Container/Component_i.cxx
index 9290062fc48edbb4ab4ae9fcf75a583c81f6c7cc..8895fb58cf608c680dbc377391d7fa5a9366f69b 100644 (file)
--- a/src/Container/Component_i.cxx
+++ b/src/Container/Component_i.cxx
@@ -665,7 +665,7 @@ void Engines_Component_i::endService(const char *serviceName)
   if ( !_CanceledThread )
     _ThreadCpuUsed = CpuUsed_impl() ;
 
-  float cpus=_ThreadCpuUsed/1000.;
+  float cpus=_ThreadCpuUsed/1000.f;
   std::cerr << "endService for " << serviceName << " Component instance : " << _instanceName ;
   std::cerr << " Cpu Used: " << cpus << " (s) " << std::endl;
   MESSAGE("Send EndService notification for " << serviceName

diff --git a/src/Container/SALOME_ContainerManager.cxx b/src/Container/SALOME_ContainerManager.cxx
index 7d7932651893bd5f0ce47eb04814f95300931c90..9696a0b71565b3d9cf69ccf7097f668f1043b5ff 100644 (file)
--- a/src/Container/SALOME_ContainerManager.cxx
+++ b/src/Container/SALOME_ContainerManager.cxx
@@ -368,7 +368,7 @@ Engines::Container_ptr SALOME_ContainerManager::GiveContainer(const Engines::Con
             break;
           }
       }
-      catch(const SALOME_Exception &ex)
+      catch(const SALOME_Exception & /*ex*/) //!< TODO: unused variable
       {
         MESSAGE("[GiveContainer] Exception in ResourceManager find !: " << ex.what());
         return ret;

diff --git a/src/Launcher/Launcher_XML_Persistence.cxx b/src/Launcher/Launcher_XML_Persistence.cxx
index 63a3cb0a521b8a79342bf41ac7fe4bd5eda94897..3da17b9f4a869e999f9ab049f6c502dec2b31d36 100644 (file)
--- a/src/Launcher/Launcher_XML_Persistence.cxx
+++ b/src/Launcher/Launcher_XML_Persistence.cxx
@@ -519,7 +519,7 @@ Job*
 XML_Persistence::createJobFromString(const std::string& jobDump)
 {
   xmlDocPtr doc;
-  doc = xmlReadMemory(jobDump.c_str(), jobDump.length(), "noname.xml", NULL, 0);
+  doc = xmlReadMemory(jobDump.c_str(), (int)jobDump.length(), "noname.xml", NULL, 0); //TODO: conversion from size_t to int, possible loss of data
   if (doc == NULL)
   {
     std::string error = "Error in xmlReadMemory in XML_Persistence::createJobFromString, could not parse string: " + jobDump;

diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
index ca62c0a078a22dd2857876c3fe3c48478e8410e0..4a5fbf68899c080d5a8862c13f3a14426d469c10 100644 (file)
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
@@ -152,7 +152,7 @@ SALOME_LifeCycleCORBA::FindComponent(const Engines::ContainerParameters& params,
     {
       listOfResources = _ResManager->GetFittingResources(new_params.resource_params);
     }
-  catch( const SALOME::SALOME_Exception& ex )
+  catch( const SALOME::SALOME_Exception& /*ex*/ ) //!< TODO: unused variable
     {
       return Engines::EngineComponent::_nil();
     }
@@ -192,7 +192,7 @@ SALOME_LifeCycleCORBA::LoadComponent(const Engines::ContainerParameters& params,
     {
       listOfResources = _ResManager->GetFittingResources(new_params.resource_params);
     }
-  catch( const SALOME::SALOME_Exception& ex )
+  catch( const SALOME::SALOME_Exception& /*ex*/ ) //!< TODO: unused variable
     {
       return Engines::EngineComponent::_nil();
     }
@@ -234,7 +234,7 @@ FindOrLoad_Component(const Engines::ContainerParameters& params,
     {
       listOfResources = _ResManager->GetFittingResources(new_params.resource_params);
     }
-  catch( const SALOME::SALOME_Exception& ex )
+  catch( const SALOME::SALOME_Exception& /*ex*/ ) //!< TODO: unused variable
     {
       return Engines::EngineComponent::_nil();
     }
@@ -449,7 +449,7 @@ void SALOME_LifeCycleCORBA::shutdownServers(bool shutdownLauncher)
       if ( !CORBA::is_nil(connMan) && ( pid != connMan->getPID() ) )
         connMan->ShutdownWithExit();
     }
-  catch(const CORBA::Exception& e)
+  catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
     {
        // ignore and continue
     }
@@ -472,7 +472,7 @@ void SALOME_LifeCycleCORBA::shutdownServers(bool shutdownLauncher)
         study->Shutdown();
       _NS->Destroy_Name("/Study");
     }
-  catch(const CORBA::Exception& e)
+  catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
     {
        // ignore and continue
     }
@@ -491,7 +491,7 @@ void SALOME_LifeCycleCORBA::shutdownServers(bool shutdownLauncher)
         catalog->shutdown();
       _NS->Destroy_Name("/Kernel/ModulCatalog");
     }
-  catch(const CORBA::Exception& e)
+  catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
     {
        // ignore and continue
     }
@@ -508,7 +508,7 @@ void SALOME_LifeCycleCORBA::shutdownServers(bool shutdownLauncher)
       if ( !CORBA::is_nil(dsm) )
         dsm->shutdownScopes();
     }
-  catch(const CORBA::Exception& e)
+  catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
     {
        // ignore and continue
     }
@@ -520,7 +520,7 @@ void SALOME_LifeCycleCORBA::shutdownServers(bool shutdownLauncher)
       if ( !CORBA::is_nil(dsm) )
         dsm->shutdownServers();
     }
-  catch(const CORBA::Exception& e)
+  catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
     {
        // ignore and continue
     }
@@ -534,7 +534,7 @@ void SALOME_LifeCycleCORBA::shutdownServers(bool shutdownLauncher)
           launcher->Shutdown();
       }
     }
-  catch(const CORBA::Exception& e)
+  catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
     {
        // ignore and continue
     }
@@ -553,7 +553,7 @@ void SALOME_LifeCycleCORBA::shutdownServers(bool shutdownLauncher)
           registry->Shutdown();
       _NS->Destroy_Name("/Registry");
     }
-  catch(const CORBA::Exception& e)
+  catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
     {
        // ignore and continue
     }

diff --git a/src/Logger/SALOME_Logger_Server.hxx b/src/Logger/SALOME_Logger_Server.hxx
index 75323215a602c48b89bef54980a8c823cd92aae4..c4a5182a228fee051ad6909359a0c0ffd0fd4b1b 100644 (file)
--- a/src/Logger/SALOME_Logger_Server.hxx
+++ b/src/Logger/SALOME_Logger_Server.hxx
@@ -57,11 +57,11 @@ class LOGGER_EXPORT Logger :
 public:
         //constructor w/o parameters
         //all messages will be put into terminal via cout
-        Logger();
+               Logger();
         //constructor with parameter, filename is output file
         //all messages will be put into special file passed as parameter
         Logger(const char *filename);
-        virtual ~Logger();
+               virtual ~Logger();
         //put message into one special place for all servers
         void putMessage(const char* message);
         void ping();
@@ -73,7 +73,6 @@ private:
         bool m_putIntoFile;
         //ofstream class specialized for disk file output
         std::ofstream m_outputFile; 
-
         //synchronisation object
         static omni_mutex myLock;
 

diff --git a/src/SALOMEDS/SALOMEDS_Study_i.cxx b/src/SALOMEDS/SALOMEDS_Study_i.cxx
index 397c9c427f8ff1b1721d1c5e0f08871794cc0998..bc2f0785b34711f9f44c5e289001adcaff524248 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Study_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_Study_i.cxx
@@ -200,7 +200,7 @@ namespace SALOMEDS
           gobj->Register();
         }
       }
-      catch(const CORBA::Exception& e)
+      catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
       {
       }
     }
@@ -216,7 +216,7 @@ namespace SALOMEDS
           gobj->UnRegister();
         }
       }
-      catch(const CORBA::Exception& e)
+      catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
       {
       }
     }

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx
index fd06e9f99f2a066b974d1256306a28b3d2e2752d..c59b5537a7855d3d374d260fe9925c061c56fb79 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx
@@ -158,7 +158,7 @@ void SALOMEDSImpl_AttributeSequenceOfInteger::Remove(const int Index)
 
 int SALOMEDSImpl_AttributeSequenceOfInteger::Length() 
 {
-  return myValue.size();
+  return (int)myValue.size(); //!< TODO: conversion from size_t to int, possible loss of data
 }
 int SALOMEDSImpl_AttributeSequenceOfInteger::Value(const int Index) 
 {
@@ -174,7 +174,7 @@ std::string SALOMEDSImpl_AttributeSequenceOfInteger::Save()
   int aLength = Length();
   char* aResult = new char[aLength * 25];
   aResult[0] = 0;
-  int aPosition = 0;
+  size_t aPosition = 0;
   for (int i = 1; i <= aLength; i++) {
     sprintf(aResult + aPosition , "%d ", Value(i));
     aPosition += strlen(aResult + aPosition);

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfReal.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfReal.cxx
index 6bc3d0dff8f9a13f9046c695f397520d9bf86828..263d72845e92618ae922804c49d848660ed4c5f1 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfReal.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfReal.cxx
@@ -160,7 +160,7 @@ void SALOMEDSImpl_AttributeSequenceOfReal::Remove(const int Index)
 
 int SALOMEDSImpl_AttributeSequenceOfReal::Length() 
 {
-  return myValue.size();
+  return (int)myValue.size(); //!< TODO: conversion from size_t to int, possible loss of data
 }
 
 double SALOMEDSImpl_AttributeSequenceOfReal::Value(const int Index) 
@@ -175,7 +175,7 @@ std::string SALOMEDSImpl_AttributeSequenceOfReal::Save()
   int aLength = Length();
   char* aResult = new char[aLength * 127];
   aResult[0] = 0;
-  int aPosition = 0;
+  size_t aPosition = 0;
   for (int i = 1; i <= aLength; i++) {
     sprintf(aResult + aPosition , "%.64e ", Value(i));
     aPosition += strlen(aResult + aPosition);

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx
index 67b3777c227a62a01d2f53f17ed089b8e36f022c..3d8467802aadf21559bb1f67b89dc4bbd80d4dc9 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx
@@ -198,7 +198,7 @@ void SALOMEDSImpl_AttributeStudyProperties::Restore(DF_Attribute* with)
   std::vector<std::string> aNames;
   std::vector<int> aMinutes, aHours, aDays, aMonths, aYears;
   aProp->GetModifications(aNames, aMinutes, aHours, aDays, aMonths, aYears);
-  for (int i = 0, len = aNames.size(); i < len; i++) {
+  for (size_t i = 0, len = aNames.size(); i < len; i++) {
     myUserName.push_back(aNames[i]);
     myMinute.push_back(aMinutes[i]);
     myHour.push_back(aHours[i]);
@@ -243,14 +243,14 @@ std::string SALOMEDSImpl_AttributeStudyProperties::Save()
   std::vector<int> aMinutes, aHours, aDays, aMonths, aYears;
   GetModifications(aNames, aMinutes, aHours, aDays, aMonths, aYears);
 
-  int aLength, anIndex, unitsSize = 0, commentSize = 0;;
+  size_t aLength, anIndex, unitsSize = 0, commentSize = 0;;
   for (aLength = 0, anIndex = aNames.size()-1; anIndex >= 0; anIndex--)
     aLength += aNames[anIndex].size() + 1;
 
   std::string units = GetUnits();
   std::string comment = GetComment();
 
-  int aLength1 = 0;
+  size_t aLength1 = 0;
   std::map<std::string, std::string> versions;
   versionMap::const_iterator it;
   for (aLength1 = 0, it = myComponentVersions.begin(); it != myComponentVersions.end(); ++it ) {

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx
index d1799c639a95161d77388034733350dcb39549a0..4792c0a82361a5dbf456851318238289b1a30f48 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx
@@ -35,7 +35,7 @@ typedef std::map<int, int>::const_iterator MI;
 static std::string getUnit(std::string theString)
 {
   std::string aString(theString);
-  int aPos = aString.find(SEPARATOR);
+  size_t aPos = aString.find(SEPARATOR);
   if(aPos <= 0 || aPos == aString.size() ) return std::string();
   return aString.substr(aPos+1, aString.size());
 }
@@ -43,7 +43,7 @@ static std::string getUnit(std::string theString)
 static std::string getTitle(std::string theString)
 {
   std::string aString(theString);
-  int aPos = aString.find(SEPARATOR);
+  size_t aPos = aString.find(SEPARATOR);
   if(aPos < 1) return aString;
   if(aPos == 0) return std::string();
   return aString.substr(0, aPos);
@@ -117,7 +117,7 @@ void SALOMEDSImpl_AttributeTableOfInteger::SetRowData(const int theRow,
                                                       const std::vector<int>& theData) 
 {
   CheckLocked();  
-  if(theData.size() > myNbColumns) SetNbColumns(theData.size());
+  if(theData.size() > myNbColumns) SetNbColumns((int)theData.size()); //!< TODO: conversion from size_t to const int, possible loss of data
 
   Backup();
 
@@ -125,7 +125,7 @@ void SALOMEDSImpl_AttributeTableOfInteger::SetRowData(const int theRow,
     myRows.push_back(std::string(""));
   }
 
-  int i, aShift = (theRow-1)*myNbColumns, aLength = theData.size();
+  size_t i, aShift = (theRow-1)*myNbColumns, aLength = theData.size();
   for(i = 1; i <= aLength; i++) {
     myTable[aShift + i] = theData[i-1];
   }
@@ -181,7 +181,7 @@ void SALOMEDSImpl_AttributeTableOfInteger::SetRowUnit(const int theRow,
 void SALOMEDSImpl_AttributeTableOfInteger::SetRowUnits(const std::vector<std::string>& theUnits)
 {
   if (theUnits.size() != GetNbRows()) throw DFexception("Invalid number of rows");
-  int aLength = theUnits.size(), i;
+  size_t aLength = theUnits.size(), i;
   for(i = 1; i <= aLength; i++) SetRowUnit(i, theUnits[i-1]);
   
   SetModifyFlag(); //SRN: Mark the study as being modified, so it could be saved 
@@ -190,7 +190,7 @@ void SALOMEDSImpl_AttributeTableOfInteger::SetRowUnits(const std::vector<std::st
 std::vector<std::string> SALOMEDSImpl_AttributeTableOfInteger::GetRowUnits()
 {
   std::vector<std::string> aSeq;
-  int aLength = myRows.size(), i;
+  size_t aLength = myRows.size(), i;
   for(i=0; i<aLength; i++) aSeq.push_back(getUnit(myRows[i]));
   return aSeq;
 }
@@ -198,7 +198,7 @@ std::vector<std::string> SALOMEDSImpl_AttributeTableOfInteger::GetRowUnits()
 void SALOMEDSImpl_AttributeTableOfInteger::SetRowTitles(const std::vector<std::string>& theTitles)
 {
   if (theTitles.size() != GetNbRows()) throw DFexception("Invalid number of rows");
-  int aLength = theTitles.size(), i;
+  size_t aLength = theTitles.size(), i;
   for(i = 1; i <= aLength; i++) SetRowTitle(i, theTitles[i-1]);
   
   SetModifyFlag(); //SRN: Mark the study as being modified, so it could be saved 
@@ -207,7 +207,7 @@ void SALOMEDSImpl_AttributeTableOfInteger::SetRowTitles(const std::vector<std::s
 std::vector<std::string> SALOMEDSImpl_AttributeTableOfInteger::GetRowTitles()
 {
   std::vector<std::string> aSeq;
-  int aLength = myRows.size(), i;
+  size_t aLength = myRows.size(), i;
   for(i=0; i<aLength; i++) aSeq.push_back(getTitle(myRows[i]));
   return aSeq;
 }
@@ -230,7 +230,7 @@ void SALOMEDSImpl_AttributeTableOfInteger::SetColumnData(const int theColumn,
 
   Backup();
 
-  int i, aLength = theData.size();
+  size_t i, aLength = theData.size();
   for(i = 1; i <= aLength; i++) {
     myTable[myNbColumns*(i-1)+theColumn] = theData[i-1];
   }
@@ -282,7 +282,7 @@ std::string SALOMEDSImpl_AttributeTableOfInteger::GetColumnTitle(const int theCo
 void SALOMEDSImpl_AttributeTableOfInteger::SetColumnTitles(const std::vector<std::string>& theTitles)
 {
   if (theTitles.size() != myNbColumns) throw DFexception("Invalid number of columns");
-  int aLength = theTitles.size(), i;
+  size_t aLength = theTitles.size(), i;
   for(i = 0; i < aLength; i++)  myCols[i] = theTitles[i];
   
   SetModifyFlag(); //SRN: Mark the study as being modified, so it could be saved 
@@ -291,7 +291,7 @@ void SALOMEDSImpl_AttributeTableOfInteger::SetColumnTitles(const std::vector<std
 std::vector<std::string> SALOMEDSImpl_AttributeTableOfInteger::GetColumnTitles()
 {
   std::vector<std::string> aSeq;
-  int aLength = myCols.size(), i;
+  size_t aLength = myCols.size(), i;
   for(i=0; i<aLength; i++) aSeq.push_back(myCols[i]);
   return aSeq;
 }
@@ -445,7 +445,7 @@ std::string SALOMEDSImpl_AttributeTableOfInteger::Save()
 {
   std::string aString;
   char* buffer = new char[1024];
-  int i, j, l;
+  size_t i, j, l;
 
   //Title
   l = myTitle.size();

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx
index 66930596ee90f4046b1be39ca7dc51e564e62463..c564d154ae53492d4aa691c6f9ac215e18178c31 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx
@@ -35,14 +35,14 @@ typedef std::map<int, double>::const_iterator MI;
 static std::string getUnit(const std::string& theString)
 {
   std::string aString(theString);
-  int aPos = aString.find(SEPARATOR);
+  size_t aPos = aString.find(SEPARATOR);
   return aPos < 0 || aPos == aString.size()-1 ? std::string() : aString.substr(aPos+1, aString.size());
 }
 
 static std::string getTitle(const std::string& theString)
 {
   std::string aString(theString);
-  int aPos = aString.find(SEPARATOR);
+  size_t aPos = aString.find(SEPARATOR);
   return aPos < 0 ? aString :aString.substr(0, aPos);
 }
 
@@ -114,7 +114,7 @@ void SALOMEDSImpl_AttributeTableOfReal::SetRowData(const int theRow,
                                                    const std::vector<double>& theData) 
 {
   CheckLocked();  
-  if(theData.size() > myNbColumns) SetNbColumns(theData.size());
+  if(theData.size() > myNbColumns) SetNbColumns((int)theData.size()); //!< TODO: conversion from size_t to const int, possible loss of data
 
   Backup();
 
@@ -122,7 +122,7 @@ void SALOMEDSImpl_AttributeTableOfReal::SetRowData(const int theRow,
     myRows.push_back(std::string(""));
   }
 
-  int i, aShift = (theRow-1)*myNbColumns, aLength = theData.size();
+  size_t i, aShift = (theRow-1)*myNbColumns, aLength = theData.size();
   for(i = 1; i <= aLength; i++) {
     myTable[aShift + i] = theData[i-1];
   }
@@ -178,7 +178,7 @@ void SALOMEDSImpl_AttributeTableOfReal::SetRowUnit(const int theRow,
 void SALOMEDSImpl_AttributeTableOfReal::SetRowUnits(const std::vector<std::string>& theUnits)
 {
   if (theUnits.size() != GetNbRows()) throw DFexception("Invalid number of rows");
-  int aLength = theUnits.size(), i;
+  size_t aLength = theUnits.size(), i;
   for(i = 1; i <= aLength; i++) SetRowUnit(i, theUnits[i-1]);
   
   SetModifyFlag(); //SRN: Mark the study as being modified, so it could be saved 
@@ -187,7 +187,7 @@ void SALOMEDSImpl_AttributeTableOfReal::SetRowUnits(const std::vector<std::strin
 std::vector<std::string> SALOMEDSImpl_AttributeTableOfReal::GetRowUnits()
 {
   std::vector<std::string> aSeq;
-  int aLength = myRows.size(), i;
+  size_t aLength = myRows.size(), i;
   for(i=0; i<aLength; i++) aSeq.push_back(getUnit(myRows[i]));
   return aSeq;
 }
@@ -195,7 +195,7 @@ std::vector<std::string> SALOMEDSImpl_AttributeTableOfReal::GetRowUnits()
 void SALOMEDSImpl_AttributeTableOfReal::SetRowTitles(const std::vector<std::string>& theTitles)
 {
   if (theTitles.size() != GetNbRows()) throw DFexception("Invalid number of rows");
-  int aLength = theTitles.size(), i;
+  size_t aLength = theTitles.size(), i;
   for(i = 1; i <= aLength; i++) SetRowTitle(i, theTitles[i-1]);
   
   SetModifyFlag(); //SRN: Mark the study as being modified, so it could be saved 
@@ -204,7 +204,7 @@ void SALOMEDSImpl_AttributeTableOfReal::SetRowTitles(const std::vector<std::stri
 std::vector<std::string> SALOMEDSImpl_AttributeTableOfReal::GetRowTitles()
 {
   std::vector<std::string> aSeq;
-  int aLength = myRows.size(), i;
+  size_t aLength = myRows.size(), i;
   for(i=0; i<aLength; i++) aSeq.push_back(getTitle(myRows[i]));
   return aSeq;
 }
@@ -228,7 +228,7 @@ void SALOMEDSImpl_AttributeTableOfReal::SetColumnData(const int theColumn,
 
   Backup();
 
-  int i, aLength = theData.size();
+  size_t i, aLength = theData.size();
   for(i = 1; i <= aLength; i++) {
     myTable[myNbColumns*(i-1)+theColumn] = theData[i-1];
   }
@@ -280,7 +280,7 @@ std::string SALOMEDSImpl_AttributeTableOfReal::GetColumnTitle(const int theColum
 void SALOMEDSImpl_AttributeTableOfReal::SetColumnTitles(const std::vector<std::string>& theTitles)
 {
   if (theTitles.size() != myNbColumns) throw DFexception("Invalid number of columns");
-  int aLength = theTitles.size(), i;
+  size_t aLength = theTitles.size(), i;
   for(i = 0; i < aLength; i++)  myCols[i] = theTitles[i];
   
   SetModifyFlag(); //SRN: Mark the study as being modified, so it could be saved 
@@ -289,7 +289,7 @@ void SALOMEDSImpl_AttributeTableOfReal::SetColumnTitles(const std::vector<std::s
 std::vector<std::string> SALOMEDSImpl_AttributeTableOfReal::GetColumnTitles()
 {
   std::vector<std::string> aSeq;
-  int aLength = myCols.size(), i;
+  size_t aLength = myCols.size(), i;
   for(i=0; i<aLength; i++) aSeq.push_back(myCols[i]);
   return aSeq;
 }
@@ -443,7 +443,7 @@ std::string SALOMEDSImpl_AttributeTableOfReal::Save()
 {
   std::string aString;
   char* buffer = new char[1024];
-  int i, j, l;
+  size_t i, j, l;
 
   //Title
   l = myTitle.size();

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx
index fe7cc685f952dc138044802656bd542d3329c8db..9e88504ddcfb971850ab1f4682db32394be439fb 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx
@@ -35,7 +35,7 @@ typedef std::map<int, std::string>::const_iterator MI;
 static std::string getUnit(std::string theString)
 {
   std::string aString(theString);
-  int aPos = aString.find(SEPARATOR);
+  size_t aPos = aString.find(SEPARATOR);
   if(aPos <= 0 || aPos == aString.size() ) return std::string();
   return aString.substr(aPos+1, aString.size());
 }
@@ -43,7 +43,7 @@ static std::string getUnit(std::string theString)
 static std::string getTitle(std::string theString)
 {
   std::string aString(theString);
-  int aPos = aString.find(SEPARATOR);
+  size_t aPos = aString.find(SEPARATOR);
   if(aPos < 1) return aString;
   if(aPos == 0) return std::string();
   return aString.substr(0, aPos);
@@ -131,14 +131,14 @@ void SALOMEDSImpl_AttributeTableOfString::SetRowUnit(const int theRow,
 void SALOMEDSImpl_AttributeTableOfString::SetRowUnits(const std::vector<std::string>& theUnits)
 {
   if (theUnits.size() != GetNbRows()) throw DFexception("Invalid number of rows");
-  int aLength = theUnits.size(), i;
+  size_t aLength = theUnits.size(), i;
   for(i = 1; i <= aLength; i++) SetRowUnit(i, theUnits[i-1]);
 }
 
 std::vector<std::string> SALOMEDSImpl_AttributeTableOfString::GetRowUnits()
 {
   std::vector<std::string> aSeq;
-  int aLength = myRows.size(), i;
+  size_t aLength = myRows.size(), i;
   for(i=0; i<aLength; i++) aSeq.push_back(getUnit(myRows[i]));
   return aSeq;
 }
@@ -146,7 +146,7 @@ std::vector<std::string> SALOMEDSImpl_AttributeTableOfString::GetRowUnits()
 void SALOMEDSImpl_AttributeTableOfString::SetRowTitles(const std::vector<std::string>& theTitles)
 {
   if (theTitles.size() != GetNbRows()) throw DFexception("Invalid number of rows");
-  int aLength = theTitles.size(), i;
+  size_t aLength = theTitles.size(), i;
   for(i = 1; i <= aLength; i++) SetRowTitle(i, theTitles[i-1]);
   
   SetModifyFlag(); //SRN: Mark the study as being modified, so it could be saved 
@@ -155,7 +155,7 @@ void SALOMEDSImpl_AttributeTableOfString::SetRowTitles(const std::vector<std::st
 std::vector<std::string> SALOMEDSImpl_AttributeTableOfString::GetRowTitles()
 {
   std::vector<std::string> aSeq;
-  int aLength = myRows.size(), i;
+  size_t aLength = myRows.size(), i;
   for(i=0; i<aLength; i++) aSeq.push_back(getTitle(myRows[i]));
   return aSeq;
 }
@@ -174,7 +174,7 @@ void SALOMEDSImpl_AttributeTableOfString::SetRowData(const int theRow,
                                                      const std::vector<std::string>& theData) 
 {
   CheckLocked();  
-  if(theData.size() > myNbColumns) SetNbColumns(theData.size());
+  if(theData.size() > myNbColumns) SetNbColumns((int)theData.size()); //!< TODO: conversion from size_t to const int, possible loss of data
 
   Backup();
 
@@ -182,7 +182,7 @@ void SALOMEDSImpl_AttributeTableOfString::SetRowData(const int theRow,
     myRows.push_back(std::string(""));
   }
 
-  int i, aShift = (theRow-1)*myNbColumns, aLength = theData.size();
+  size_t i, aShift = (theRow-1)*myNbColumns, aLength = theData.size();
   for(i = 1; i <= aLength; i++) {
     myTable[aShift + i] = theData[i-1];
   }
@@ -228,7 +228,7 @@ void SALOMEDSImpl_AttributeTableOfString::SetColumnData(const int theColumn,
 
   Backup();
 
-  int i, aLength = theData.size();
+  size_t i, aLength = theData.size();
   for(i = 1; i <= aLength; i++) {
     myTable[myNbColumns*(i-1)+theColumn] = theData[i-1];
   }
@@ -280,7 +280,7 @@ std::string SALOMEDSImpl_AttributeTableOfString::GetColumnTitle(const int theCol
 void SALOMEDSImpl_AttributeTableOfString::SetColumnTitles(const std::vector<std::string>& theTitles)
 {
   if (theTitles.size() != myNbColumns) throw DFexception("Invalid number of columns");
-  int aLength = theTitles.size(), i;
+  size_t aLength = theTitles.size(), i;
   for(i = 0; i < aLength; i++)  myCols[i] =  theTitles[i];
   
   SetModifyFlag(); //SRN: Mark the study as being modified, so it could be saved 
@@ -289,7 +289,7 @@ void SALOMEDSImpl_AttributeTableOfString::SetColumnTitles(const std::vector<std:
 std::vector<std::string> SALOMEDSImpl_AttributeTableOfString::GetColumnTitles()
 {
   std::vector<std::string> aSeq;
-  int aLength = myCols.size(), i;
+  size_t aLength = myCols.size(), i;
   for(i=0; i<aLength; i++) aSeq.push_back(myCols[i]);
   return aSeq;
 }
@@ -442,7 +442,7 @@ std::string SALOMEDSImpl_AttributeTableOfString::Save()
 {
   std::string aString;
   char* buffer = new char[1024];
-  int i, j, l;
+  size_t i, j, l;
 
   //Title
   l = myTitle.size();
@@ -491,7 +491,7 @@ std::string SALOMEDSImpl_AttributeTableOfString::Save()
     if (p->second.size()) { // check empty string in the value table
       sprintf(buffer, "%d\n", p->first);
       aString += buffer;
-      unsigned long aValueSize = p->second.size();
+      unsigned long aValueSize = (unsigned long)p->second.size(); //!< TODO conversion from size_t to unsigned long, possible loss of data
       sprintf(buffer, "%ld\n", aValueSize);
       aString +=buffer;
       aString += p->second;

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx
index d57c511ad85cda575cff93d0a63d63606bb5b334..bcd63d0210113177b7230674c47db0664af4061a 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx
@@ -336,12 +336,12 @@ bool SALOMEDSImpl_StudyBuilder::LoadWith(const SALOMEDSImpl_SComponent& anSCO,
       hasModuleData = true;
 
       unsigned char* aStreamFile = NULL;
-      int aStreamSize = 0;
+      size_t aStreamSize = 0;
 
       if (hdf_sco_group->ExistInternalObject("FILE_STREAM")) {
         HDFdataset *hdf_dataset = new HDFdataset("FILE_STREAM", hdf_sco_group);
         hdf_dataset->OpenOnDisk();
-        aStreamSize = hdf_dataset->GetSize();
+        aStreamSize = (size_t)hdf_dataset->GetSize();
         aStreamFile  = new unsigned char[aStreamSize];
         if(aStreamFile == NULL) throw HDFexception("Unable to open dataset FILE_STREAM");
         hdf_dataset->ReadFromDisk(aStreamFile);

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx
index c524e3d69a66c32dccba5a00ffe6592319dd6548..c1d0305889c215eaa4701d718d29a5346bb56301 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx
@@ -77,7 +77,7 @@ void SALOMEDSImpl_Tool::RemoveTemporaryFiles(const std::string& theDirectory,
 {
   std::string aDirName = theDirectory;
 
-  int i, aLength = theFiles.size();
+  size_t i, aLength = theFiles.size(); 
   for(i=1; i<=aLength; i++) {
     std::string aFile(aDirName);
     aFile += theFiles[i-1];
@@ -118,7 +118,7 @@ void SALOMEDSImpl_Tool::RemoveTemporaryFiles(const std::string& theDirectory,
 //============================================================================
 std::string SALOMEDSImpl_Tool::GetNameFromPath(const std::string& thePath) {
   if (thePath.empty()) return "";
-  int pos = thePath.rfind('/');
+  size_t pos = thePath.rfind('/');
   if(pos >= 0) return thePath.substr(pos+1, thePath.size());
   pos = thePath.rfind('\\'); 
   if(pos >= 0) return thePath.substr(pos+1, thePath.size()); 
@@ -140,7 +140,7 @@ std::string SALOMEDSImpl_Tool::GetDirFromPath(const std::string& thePath) {
 
   std::string path;
   if (!thePath.empty()) {
-    int pos = thePath.rfind('/');
+    size_t pos = thePath.rfind('/');
     if (pos < 0) pos = thePath.rfind('\\');
     if (pos < 0) pos = thePath.rfind('|');
     
@@ -169,7 +169,7 @@ std::vector<std::string> SALOMEDSImpl_Tool::splitString(const std::string& theVa
 {
   std::vector<std::string> vs;
   if(theValue[0] == separator && theValue.size() == 1) return vs;
-  int pos = theValue.find(separator);
+  size_t pos = theValue.find(separator);
   if(pos < 0) {
     vs.push_back(theValue);
     return vs;
@@ -197,7 +197,7 @@ std::vector<std::string> treatRepetation(const std::string& theValue);
 std::vector<std::string> treatRepetation(const std::string& theValue)
 {
   std::vector<std::string> aResult;
-  int pos = theValue.find(";*=");
+  size_t pos = theValue.find(";*=");
   if(pos < 0 )
     {
       aResult.push_back(theValue);
@@ -217,7 +217,7 @@ std::vector<std::string> SALOMEDSImpl_Tool::splitStringWithEmpty(const std::stri
 {
   std::vector<std::string> aResult;
   if(theValue[0] == sep ) aResult.push_back(std::string());
-  int pos = theValue.find(sep);
+  size_t pos = theValue.find(sep);
   if(pos < 0 ) {
     if(sep == '|')
       {
@@ -266,7 +266,7 @@ std::vector< std::vector<std::string> > SALOMEDSImpl_Tool::splitStringWithEmpty(
   std::vector< std::vector<std::string> > aResult;
   if(theValue.size() > 0) {
     std::vector<std::string> aSections = splitStringWithEmpty( theValue, sep1 );
-    for( int i = 0, n = aSections.size(); i < n; i++ )
+    for( size_t i = 0, n = aSections.size(); i < n; i++ )
       aResult.push_back( splitStringWithEmpty( aSections[i], sep2 ) );
   }
   return aResult;

diff --git a/src/SALOMESDS/SALOMESDS_AutoRefCountPtr.hxx b/src/SALOMESDS/SALOMESDS_AutoRefCountPtr.hxx
index c03f76f2d3c9d65619b400e3c2cdcccbb70d2c2f..e4046eae6fbb0b06b881be2f1adfdda69890bdaa 100644 (file)
--- a/src/SALOMESDS/SALOMESDS_AutoRefCountPtr.hxx
+++ b/src/SALOMESDS/SALOMESDS_AutoRefCountPtr.hxx
@@ -39,7 +39,7 @@ namespace SALOMESDS
       {
           id=poa->activate_object(this);
       }
-      catch(PortableServer::POA::ServantAlreadyActive& e)
+      catch(PortableServer::POA::ServantAlreadyActive& /*e*/) //!< TODO: unused variables
       {
           id=poa->servant_to_id(this);
       }

diff --git a/src/SALOMESDS/SALOMESDS_DataScopeServer.cxx b/src/SALOMESDS/SALOMESDS_DataScopeServer.cxx
index 7cf02f68ebc74efb4330313c0100e0c6526e643f..fa24f9f2e0e6710ada456d6ee85e8f0e57cfc1ae 100644 (file)
--- a/src/SALOMESDS/SALOMESDS_DataScopeServer.cxx
+++ b/src/SALOMESDS/SALOMESDS_DataScopeServer.cxx
@@ -113,13 +113,13 @@ SALOME::StringVec *DataScopeServerBase::listVars()
 {
   SALOME::StringVec *ret(new SALOME::StringVec);
   std::size_t sz(_vars.size());
-  ret->length(sz);
+  ret->length((_CORBA_ULong)sz); //!< TODO: size_t to _CORBA_ULong
   std::list< std::pair< SALOME::BasicDataServer_var, BasicDataServer * > >::iterator it(_vars.begin());
   for(std::size_t i=0;i<sz;it++,i++)
     {
       BasicDataServer *obj((*it).second);
       std::string name(obj->getVarNameCpp());
-      (*ret)[i]=CORBA::string_dup(name.c_str());
+      (*ret)[(_CORBA_ULong)i]=CORBA::string_dup(name.c_str()); //!< TODO: size_t to _CORBA_ULong
     }
   return ret;
 }
@@ -230,13 +230,13 @@ SALOME::SeqOfByteVec *DataScopeServerBase::getAllKeysOfVarWithTypeDict(const cha
     }
   Py_ssize_t sz(PyList_Size(keys));
   SALOME::SeqOfByteVec *ret(new SALOME::SeqOfByteVec);
-  ret->length(sz);
+  ret->length((_CORBA_ULong)sz); //!< TODO: convert Py_ssize_t in _CORBA_ULong
   for(Py_ssize_t i=0;i<sz;i++)
     {
       PyObject *item(PyList_GetItem(keys,i));
       Py_XINCREF(item);
       std::string pickel(varc->pickelize(item));//item consumed
-      PickelizedPyObjServer::FromCppToByteSeq(pickel,(*ret)[i]);
+      PickelizedPyObjServer::FromCppToByteSeq(pickel,(*ret)[(_CORBA_ULong)i]); //!< TODO: convert Py_ssize_t in _CORBA_ULong
     }
   Py_XDECREF(keys);
   return ret;
@@ -893,7 +893,7 @@ void DataScopeServerTransaction::atomicApply(const SALOME::ListOfTransaction& tr
       Transaction *elt(0);
       try
         {
-          eltBase=_poa->reference_to_servant(transactions[i]);
+          eltBase=_poa->reference_to_servant(transactions[(_CORBA_ULong)i]); //!< TODO: size_t to _CORBA_ULong
           elt=dynamic_cast<Transaction *>(eltBase);
         }
       catch(...)

diff --git a/src/SALOMESDS/SALOMESDS_DataServerManager.cxx b/src/SALOMESDS/SALOMESDS_DataServerManager.cxx
index 428cdc684bee9e4a5d40c62b2fbdc6a994f9c292..5f0098fa125398ee95437ce270ad90a75965c6e1 100644 (file)
--- a/src/SALOMESDS/SALOMESDS_DataServerManager.cxx
+++ b/src/SALOMESDS/SALOMESDS_DataServerManager.cxx
@@ -72,9 +72,9 @@ SALOME::StringVec *DataServerManager::listScopes()
   std::vector<std::string> scopes(listOfScopesCpp());
   SALOME::StringVec *ret(new SALOME::StringVec);
   std::size_t sz(scopes.size());
-  ret->length(sz);
+  ret->length((_CORBA_ULong)sz); //!< TODO: size_t to _CORBA_ULong
   for(std::size_t i=0;i<sz;i++)
-    (*ret)[i]=CORBA::string_dup(scopes[i].c_str());
+    (*ret)[(_CORBA_ULong)i]=CORBA::string_dup(scopes[i].c_str()); //!< TODO: size_t to _CORBA_ULong
   return ret;
 }
 
@@ -91,9 +91,9 @@ SALOME::StringVec *DataServerManager::listAliveAndKickingScopes()
   //
   SALOME::StringVec *ret(new SALOME::StringVec);
   sz=retCpp.size();
-  ret->length(sz);
+  ret->length((_CORBA_ULong)sz); //!< TODO: size_t to _CORBA_ULong
   for(std::size_t i=0;i<sz;i++)
-    (*ret)[i]=CORBA::string_dup(retCpp[i].c_str());
+    (*ret)[(_CORBA_ULong)i]=CORBA::string_dup(retCpp[i].c_str()); //!< TODO: size_t to _CORBA_ULong
   return ret;
 }
 

diff --git a/src/SALOMESDS/SALOMESDS_PickelizedPyObjServer.cxx b/src/SALOMESDS/SALOMESDS_PickelizedPyObjServer.cxx
index b1eac00689f5c05c2ef35e17969bab4c5e4858b8..7e4fa77c6b13ed6c932425c17adafe4d88d7562c 100644 (file)
--- a/src/SALOMESDS/SALOMESDS_PickelizedPyObjServer.cxx
+++ b/src/SALOMESDS/SALOMESDS_PickelizedPyObjServer.cxx
@@ -88,16 +88,16 @@ void PickelizedPyObjServer::FromByteSeqToCpp(const SALOME::ByteVec& bsToBeConv,
   ret.resize(sz,' ');
   char *buf(const_cast<char *>(ret.c_str()));
   for(std::size_t i=0;i<sz;i++)
-    buf[i]=bsToBeConv[i];
+    buf[i]=bsToBeConv[(_CORBA_ULong)i]; //!< TODO: size_t to _CORBA_ULong
 }
 
 void PickelizedPyObjServer::FromCppToByteSeq(const std::string& strToBeConv, SALOME::ByteVec& ret)
 {
   const char *buf(strToBeConv.c_str());
   std::size_t sz(strToBeConv.size());
-  ret.length(sz);
+  ret.length((_CORBA_ULong)sz); //!< TODO: size_t to _CORBA_ULong
   for(std::size_t i=0;i<sz;i++)
-    ret[i]=buf[i];
+    ret[(_CORBA_ULong)i]=buf[i]; //!< TODO: size_t to _CORBA_ULong
 }
 
 SALOME::ByteVec *PickelizedPyObjServer::FromCppToByteSeq(const std::string& strToBeConv)

diff --git a/src/SALOMESDS/SALOMESDS_Transaction.cxx b/src/SALOMESDS/SALOMESDS_Transaction.cxx
index 170180fe51ea10208d59b2da967d16f5a96a4f93..c1ae54b221f1680ff901c00b632c9725a7e5ab9e 100644 (file)
--- a/src/SALOMESDS/SALOMESDS_Transaction.cxx
+++ b/src/SALOMESDS/SALOMESDS_Transaction.cxx
@@ -35,15 +35,15 @@ void Transaction::FromByteSeqToVB(const SALOME::ByteVec& bsToBeConv, std::vector
   ret.resize(sz);
   unsigned char *buf(const_cast<unsigned char *>(&ret[0]));
   for(std::size_t i=0;i<sz;i++)
-    buf[i]=bsToBeConv[i];
+    buf[i]=bsToBeConv[(_CORBA_ULong)i]; //!< TODO: size_t to _CORBA_ULong
 }
 
 void Transaction::FromVBToByteSeq(const std::vector<unsigned char>& bsToBeConv, SALOME::ByteVec& ret)
 {
   std::size_t sz(bsToBeConv.size());
-  ret.length(sz);
+  ret.length((_CORBA_ULong)sz); //!< TODO: size_t to _CORBA_ULong
   for(std::size_t i=0;i<sz;i++)
-    ret[i]=bsToBeConv[i];
+    ret[(_CORBA_ULong)i]=bsToBeConv[i]; //!< TODO: size_t to _CORBA_ULong
 }
 
 Transaction::~Transaction()