From: vsr Date: Mon, 14 Sep 2020 14:47:09 +0000 (+0300) Subject: Corrections X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ec6819a01e893370f71af750ba4db73748c6b87f;p=modules%2Fkernel.git Corrections --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a44b20b02..384bb6543 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) +CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR) INCLUDE(CMakeDependentOption) PROJECT(SalomeKERNEL C CXX) diff --git a/src/Basics/Basics_DirUtils.cxx b/src/Basics/Basics_DirUtils.cxx index 9fc6eb6f0..64582e9ac 100644 --- a/src/Basics/Basics_DirUtils.cxx +++ b/src/Basics/Basics_DirUtils.cxx @@ -55,11 +55,11 @@ namespace Kernel_Utils { std::string tmp_str = file_path; auto pos = file_path.rfind( _separator_ ); - if ( pos >= 0 ) // TODO: always true + if ( pos != std::string::npos ) tmp_str = pos < file_path.size()-1 ? file_path.substr( pos+1 ) : ""; pos = tmp_str.rfind( _extension_ ); - if( !with_extension && pos >= 0 ) // TODO: always true + if( !with_extension && pos != std::string::npos ) tmp_str = pos < tmp_str.size()-1 ? tmp_str.substr( 0, pos ) : ""; return tmp_str; @@ -68,7 +68,7 @@ namespace Kernel_Utils std::string GetDirName( const std::string& file_path ) { auto pos = file_path.rfind( _separator_ ); - if ( pos >= 0 ) // TODO: always true + if ( pos != std::string::npos ) return pos < file_path.size()-1 ? file_path.substr(0, pos ) : ""; return std::string("."); } @@ -191,7 +191,7 @@ namespace Kernel_Utils { std::string tmp_str = name; auto pos = tmp_str.rfind( _extension_ ); - if( pos < 0 ) // TODO: always true + if( pos == std::string::npos ) return tmp_str.append( _extension_ ); return tmp_str; } diff --git a/src/Basics/Basics_Utils.hxx b/src/Basics/Basics_Utils.hxx index c28344a9e..f830c887b 100644 --- a/src/Basics/Basics_Utils.hxx +++ b/src/Basics/Basics_Utils.hxx @@ -28,7 +28,7 @@ #include "SALOME_Basics.hxx" #include #include -#define SALOME_UNUSED(var) (void)var + #ifndef WIN32 #include #else @@ -37,6 +37,9 @@ #pragma warning (disable : 4251) #endif +#ifndef SALOME_UNUSED +#define SALOME_UNUSED(var) (void)var +#endif namespace Kernel_Utils { diff --git a/src/Communication/ReceiverFactory.cxx b/src/Communication/ReceiverFactory.cxx index 623e9e763..b96b7c9f9 100644 --- a/src/Communication/ReceiverFactory.cxx +++ b/src/Communication/ReceiverFactory.cxx @@ -49,7 +49,7 @@ /*! This method performs the transfert of double array with the remote SenderDouble given. If it fails with this SenderDouble it tries with an another protocol (CORBA by default). */ -double *ReceiverFactory::getValue(SALOME::SenderDouble_ptr sender,long &size)noexcept +double *ReceiverFactory::getValue(SALOME::SenderDouble_ptr sender,long &size) { double *ret; try{ @@ -69,7 +69,7 @@ double *ReceiverFactory::getValue(SALOME::SenderDouble_ptr sender,long &size)noe /*! This method performs the transfert of int array with the remote SenderInt given. If it fails with this SenderInt it tries with an another protocol (CORBA by default). */ -int *ReceiverFactory::getValue(SALOME::SenderInt_ptr sender,long &size)noexcept +int *ReceiverFactory::getValue(SALOME::SenderInt_ptr sender,long &size) { int *ret; try{ @@ -89,7 +89,7 @@ int *ReceiverFactory::getValue(SALOME::SenderInt_ptr sender,long &size)noexcept /*! This method performs the transfert with the remote SenderDouble given. If it fails an exception is thrown. */ -double *ReceiverFactory::getValueOneShot(SALOME::SenderDouble_ptr sender,long &size)noexcept +double *ReceiverFactory::getValueOneShot(SALOME::SenderDouble_ptr sender,long &size) { SALOME::CorbaDoubleNCSender_ptr cncD_ptr; SALOME::CorbaDoubleCSender_ptr cwcD_ptr; @@ -139,7 +139,7 @@ double *ReceiverFactory::getValueOneShot(SALOME::SenderDouble_ptr sender,long &s /*! This method performs the transfert with the remote SenderInt given. If it fails an exception is thrown. */ -int *ReceiverFactory::getValueOneShot(SALOME::SenderInt_ptr sender,long &size)noexcept +int *ReceiverFactory::getValueOneShot(SALOME::SenderInt_ptr sender,long &size) { SALOME::CorbaLongNCSender_ptr cncL_ptr; SALOME::CorbaLongCSender_ptr cwcL_ptr; diff --git a/src/Communication/ReceiverFactory.hxx b/src/Communication/ReceiverFactory.hxx index 89c165fda..7d59f53c2 100644 --- a/src/Communication/ReceiverFactory.hxx +++ b/src/Communication/ReceiverFactory.hxx @@ -36,11 +36,11 @@ class COMMUNICATION_EXPORT ReceiverFactory { public: - static double *getValue(SALOME::SenderDouble_ptr sender,long &size)noexcept; - static int *getValue(SALOME::SenderInt_ptr sender,long &size)noexcept; + static double *getValue(SALOME::SenderDouble_ptr sender,long &size); + static int *getValue(SALOME::SenderInt_ptr sender,long &size); private: - static double *getValueOneShot(SALOME::SenderDouble_ptr sender,long &size)noexcept; - static int *getValueOneShot(SALOME::SenderInt_ptr sender,long &size)noexcept; + static double *getValueOneShot(SALOME::SenderDouble_ptr sender,long &size); + static int *getValueOneShot(SALOME::SenderInt_ptr sender,long &size); }; #endif diff --git a/src/Communication/SALOME_Comm_i.cxx b/src/Communication/SALOME_Comm_i.cxx index 141e10156..20cfab93f 100644 --- a/src/Communication/SALOME_Comm_i.cxx +++ b/src/Communication/SALOME_Comm_i.cxx @@ -492,7 +492,7 @@ void* SALOME_SocketSender_i::myThread(void *args) return args; } -void SALOME_SocketSender_i::initCom() +void SALOME_SocketSender_i::initCom() { struct sockaddr_in serv_addr; socklen_t n; @@ -537,7 +537,7 @@ void SALOME_SocketSender_i::initCom() SCRUTE(_port); } -void SALOME_SocketSender_i::acceptCom() +void SALOME_SocketSender_i::acceptCom() { socklen_t sin_size; struct sockaddr_in client_addr; diff --git a/src/Communication/SenderFactory.cxx b/src/Communication/SenderFactory.cxx index d94e04246..d4b8598fb 100644 --- a/src/Communication/SenderFactory.cxx +++ b/src/Communication/SenderFactory.cxx @@ -37,7 +37,7 @@ #define SALOME_CorbaLongSender SALOME_CorbaLongCSender_i #endif -SALOME::SenderDouble_ptr SenderFactory::buildSender(SALOMEMultiComm &multiCommunicator,const double *tab,long lgr,bool ownTab)noexcept { +SALOME::SenderDouble_ptr SenderFactory::buildSender(SALOMEMultiComm &multiCommunicator,const double *tab,long lgr,bool ownTab) { switch(multiCommunicator.getProtocol()) { case SALOME::CORBA_: @@ -70,7 +70,7 @@ SALOME::SenderDouble_ptr SenderFactory::buildSender(SALOMEMultiComm &multiCommun } } -SALOME::SenderInt_ptr SenderFactory::buildSender(SALOMEMultiComm &multiCommunicator,const int *tab,long lgr,bool ownTab)noexcept { +SALOME::SenderInt_ptr SenderFactory::buildSender(SALOMEMultiComm &multiCommunicator,const int *tab,long lgr,bool ownTab) { switch(multiCommunicator.getProtocol()) { case SALOME::CORBA_: diff --git a/src/Communication/SenderFactory.hxx b/src/Communication/SenderFactory.hxx index ceaaf2f44..9e6b460a9 100644 --- a/src/Communication/SenderFactory.hxx +++ b/src/Communication/SenderFactory.hxx @@ -40,8 +40,8 @@ class SALOME_SenderInt_i; class COMMUNICATION_EXPORT SenderFactory { public: - static SALOME::SenderDouble_ptr buildSender(SALOMEMultiComm &multiCommunicator,const double *tab,long lgr,bool ownTab=false) noexcept; - static SALOME::SenderInt_ptr buildSender(SALOMEMultiComm &multiCommunicator,const int *tab,long lgr,bool ownTab=false) noexcept; + static SALOME::SenderDouble_ptr buildSender(SALOMEMultiComm &multiCommunicator,const double *tab,long lgr,bool ownTab=false); + static SALOME::SenderInt_ptr buildSender(SALOMEMultiComm &multiCommunicator,const int *tab,long lgr,bool ownTab=false); static SALOME::SenderDouble_ptr buildSender(SALOME::TypeOfCommunication NewType,SALOME_SenderDouble_i *src); static SALOME::SenderInt_ptr buildSender(SALOME::TypeOfCommunication NewType,SALOME_SenderInt_i *src); }; diff --git a/src/Container/Component_i.cxx b/src/Container/Component_i.cxx index d31c8c3c3..fa8a84591 100644 --- a/src/Container/Component_i.cxx +++ b/src/Container/Component_i.cxx @@ -307,7 +307,7 @@ void Engines_Component_i::setProperties(const Engines::FieldsDict& dico) Engines::FieldsDict* Engines_Component_i::getProperties() { Engines::FieldsDict_var copie = new Engines::FieldsDict; - copie->length((_CORBA_ULong)_fieldsDict.size()); //!< TODO: conversion from size_t to _CORBA_ULong + copie->length((CORBA::ULong)_fieldsDict.size()); std::map::iterator it; CORBA::ULong i = 0; for (it = _fieldsDict.begin(); it != _fieldsDict.end(); it++, i++) @@ -873,17 +873,15 @@ std::string Engines_Component_i::GetDynLibraryName(const char *componentName) */ //============================================================================= -Engines::TMPFile* Engines_Component_i::DumpPython(CORBA::Boolean isPublished, +Engines::TMPFile* Engines_Component_i::DumpPython(CORBA::Boolean /*isPublished*/, CORBA::Boolean isMultiFile, CORBA::Boolean& isValidScript) { - SALOME_UNUSED(isPublished); const char* aScript = isMultiFile ? "def RebuildData(): pass" : ""; char* aBuffer = new char[strlen(aScript)+1]; strcpy(aBuffer, aScript); - CORBA::Octet* anOctetBuf = (CORBA::Octet*)aBuffer; - int aBufferSize = (int)strlen(aBuffer)+1; //!< TODO: conversion from size_t to int - Engines::TMPFile_var aStreamFile = new Engines::TMPFile(aBufferSize, aBufferSize, anOctetBuf, 1); + size_t aBufferSize = strlen(aBuffer)+1; + Engines::TMPFile_var aStreamFile = new Engines::TMPFile((CORBA::ULong)aBufferSize, (CORBA::ULong)aBufferSize, (CORBA::Octet*)aBuffer, 1); isValidScript = true; return aStreamFile._retn(); } @@ -1040,11 +1038,10 @@ Engines_Component_i::checkOutputFilesToService(const char* service_name) */ //============================================================================= void -Engines_Component_i::configureSalome_file(std::string service_name, - std::string file_port_name, - Salome_file_i * file) +Engines_Component_i::configureSalome_file(std::string /*service_name*/, + std::string /*file_port_name*/, + Salome_file_i* /*file*/) { - SALOME_UNUSED(file); // By default this method does nothing } @@ -1079,16 +1076,37 @@ void Engines_Component_i::setContainerName() //============================================================================= /*! - \brief Get version of the component - - This method is supposed to be implemented in all derived classes; default implementation - returns empty string that means that no version information about the component is available. + * \brief Return \c true if component can provide creation information. + */ +//============================================================================= +bool Engines_Component_i::hasObjectInfo() +{ + return false; +} - \note The version of the component is stored to the study, as a part of general persistence - mechanism; once stored, version information in the study cannot be changed. +//============================================================================= +/*! + * \brief Get creation information for object addressed by given entry. + */ +//============================================================================= +char* Engines_Component_i::getObjectInfo(const char* /*entry*/) +{ + return CORBA::string_dup(""); +} - \return string containing component's version, e.g. "1.0" -*/ +//============================================================================= +/*! + * \brief Get version of the component + * + * This method is supposed to be implemented in all derived classes; default implementation + * returns empty string that means that no version information about the component is available. + * + * \note The version of the component is stored to the study, as a part of general persistence + * mechanism; once stored, version information in the study cannot be changed. + * + * \return string containing component's version, e.g. "1.0" + */ +//============================================================================= char* Engines_Component_i::getVersion() { return CORBA::string_dup( "" ); diff --git a/src/Container/Container_i.cxx b/src/Container/Container_i.cxx index b8766c00e..4b2a4787a 100644 --- a/src/Container/Container_i.cxx +++ b/src/Container/Container_i.cxx @@ -368,7 +368,7 @@ void Engines_Container_i::Shutdown() { itm->second->destroy(); } - catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable + catch(const CORBA::Exception&) { // ignore this entry and continue } @@ -1217,9 +1217,8 @@ void Engines_Container_i::decInstanceCnt(std::string genericRegisterName) Engines::EngineComponent_ptr Engines_Container_i::load_impl( const char* genericRegisterName, - const char* componentName ) + const char* /*componentName*/ ) { - SALOME_UNUSED(componentName); char* reason; std::string impl_name = std::string(LIB) + genericRegisterName + ENGINESO; Engines::EngineComponent_var iobject = Engines::EngineComponent::_nil() ; diff --git a/src/Container/Container_init_python.cxx b/src/Container/Container_init_python.cxx index 6e8a913e1..4af0f0135 100644 --- a/src/Container/Container_init_python.cxx +++ b/src/Container/Container_init_python.cxx @@ -29,7 +29,6 @@ #include "utilities.h" #include "Container_init_python.hxx" -#include "Basics_Utils.hxx" #if PY_VERSION_HEX < 0x03050000 static char* @@ -74,9 +73,8 @@ ContainerPyStdOut_write(ContainerPyStdOut *self, PyObject *args) } static PyObject* -ContainerPyStdOut_flush(ContainerPyStdOut *self) +ContainerPyStdOut_flush(ContainerPyStdOut* /*self*/) { - SALOME_UNUSED(self); Py_INCREF(Py_None); return Py_None; } @@ -173,7 +171,6 @@ void KERNEL_PYTHON::init_python(int argc, char **argv) MESSAGE("================================================================="); // set stdout to line buffering (aka C++ std::cout) setvbuf(stdout, (char *)NULL, _IOLBF, BUFSIZ); - wchar_t* salome_python; //!< TODO: unused variable char* env_python=getenv("SALOME_PYTHON"); if(env_python != 0) { diff --git a/src/Container/SALOME_Component_i.hxx b/src/Container/SALOME_Component_i.hxx index c2e1fdf20..57557ffc7 100644 --- a/src/Container/SALOME_Component_i.hxx +++ b/src/Container/SALOME_Component_i.hxx @@ -31,7 +31,6 @@ #include -#include "Basics_Utils.hxx" #include "SALOME_Container.hxx" #include @@ -116,8 +115,8 @@ public: const char* Salome_file_name); // Object information - virtual bool hasObjectInfo() { return false; } - virtual char* getObjectInfo(const char* entry) { SALOME_UNUSED(entry); return CORBA::string_dup(""); } + virtual bool hasObjectInfo(); + virtual char* getObjectInfo(const char* entry); // Version information virtual char* getVersion(); diff --git a/src/Container/SALOME_ContainerManager.cxx b/src/Container/SALOME_ContainerManager.cxx index 310551486..69acb29e2 100644 --- 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) //!< TODO: unused variable + catch(const SALOME_Exception &ex) //!< TODO: unused variable { MESSAGE("[GiveContainer] Exception in ResourceManager find !: " << ex.what()); return ret; @@ -2059,7 +2059,7 @@ SALOME_ContainerManager::LaunchPaCONodeContainer(const std::string& /*command*/, const Engines::ContainerParameters& /*params*/, const std::string& /*name*/, SALOME_ContainerManager::actual_launch_machine_t & /*vect_machine*/) -{ - return false; +{ + return false; } #endif diff --git a/src/Container/SALOME_FileTransfer_i.cxx b/src/Container/SALOME_FileTransfer_i.cxx index 1240fd0e3..26769b747 100644 --- a/src/Container/SALOME_FileTransfer_i.cxx +++ b/src/Container/SALOME_FileTransfer_i.cxx @@ -134,9 +134,9 @@ Engines::fileBlock* fileTransfer_i::getBlock(CORBA::Long fileId) CORBA::Octet *buf; buf = Engines::fileBlock::allocbuf(FILEBLOCK_SIZE); - int nbRed = (int)fread(buf, sizeof(CORBA::Octet), FILEBLOCK_SIZE, fp); //!< TODO: conversion from size_t to int + size_t nbRed = fread(buf, sizeof(CORBA::Octet), FILEBLOCK_SIZE, fp); //SCRUTE(nbRed); - aBlock->replace(nbRed, nbRed, buf, 1); // 1 means give ownership + aBlock->replace((CORBA::ULong)nbRed, (CORBA::ULong)nbRed, buf, 1); // 1 means give ownership return aBlock; } diff --git a/src/Container/Salome_file_i.cxx b/src/Container/Salome_file_i.cxx index 0a53e8069..f0cb61444 100644 --- a/src/Container/Salome_file_i.cxx +++ b/src/Container/Salome_file_i.cxx @@ -23,7 +23,6 @@ // $Header: // #include "Salome_file_i.hxx" -#include "Basics_Utils.hxx" #include "utilities.h" #include #include "HDFOI.hxx" @@ -194,7 +193,7 @@ Salome_file_i::load(const char* hdf5_file) { throw SALOME::SALOME_Exception(es); }; hdf_dataset->ReadFromDisk(buffer); - if ( write(fd,buffer, static_cast(size)) <0) { + if ( write(fd,buffer,(unsigned int)size) <0) { SALOME::ExceptionStruct es; es.type = SALOME::INTERNAL_ERROR; std::string text = "write failed"; @@ -502,7 +501,7 @@ Salome_file_i::setLocalFile(const char* comp_file_name) std::string cp_file_name(comp_file_name); std::size_t index = cp_file_name.rfind("/"); - if (index != -1) //TODO: std::string::npos + if (index != std::string::npos) { file_name = cp_file_name.substr(index+1); path = cp_file_name.substr(0,index+1); @@ -564,7 +563,7 @@ Salome_file_i::setDistributedFile(const char* comp_file_name) std::string cp_file_name(comp_file_name); std::size_t index = cp_file_name.rfind("/"); - if (index != -1) //TODO: std::string::npos + if (index != std::string::npos) { file_name = cp_file_name.substr(index+1); path = cp_file_name.substr(0,index+1); @@ -884,9 +883,8 @@ Salome_file_i::getDistributedFile(std::string file_name) */ //============================================================================= void -Salome_file_i::removeFile(const char* file_name) +Salome_file_i::removeFile(const char* /*file_name*/) { - SALOME_UNUSED(file_name); MESSAGE("Salome_file_i::removeFile : NOT YET IMPLEMENTED"); } @@ -911,7 +909,7 @@ Engines::files* Salome_file_i::getFilesInfos() { Engines::files * infos = new Engines::files(); - infos->length(static_cast(_fileManaged.size())); + infos->length((CORBA::ULong)_fileManaged.size()); _t_fileManaged::iterator begin = _fileManaged.begin(); _t_fileManaged::iterator end = _fileManaged.end(); @@ -1061,7 +1059,7 @@ Salome_file_i::getBlock(CORBA::Long fileId) CORBA::Octet *buf; buf = Engines::fileBlock::allocbuf(FILEBLOCK_SIZE); size_t nbRed = fread(buf, sizeof(CORBA::Octet), FILEBLOCK_SIZE, fp); - aBlock->replace((_CORBA_ULong)nbRed, (_CORBA_ULong)nbRed, buf, 1); // 1 means give ownership //!< TODO: conversion from size_t to _CORBA_ULong + aBlock->replace((CORBA::ULong)nbRed, (CORBA::ULong)nbRed, buf, 1); // 1 means give ownership //!< TODO: conversion from size_t to CORBA::ULong return aBlock; } diff --git a/src/DF/DF_Application.cxx b/src/DF/DF_Application.cxx index 60f3066a5..7b144bd50 100644 --- a/src/DF/DF_Application.cxx +++ b/src/DF/DF_Application.cxx @@ -19,7 +19,6 @@ #include "DF_definitions.hxx" #include "DF_Application.hxx" -#include "Basics_Utils.hxx" //Constructor DF_Application::DF_Application() @@ -77,25 +76,21 @@ std::vector DF_Application::GetDocumentIDs() //Returns a number of existent documents int DF_Application::NbDocuments() { - //TODO: return ot ? - return static_cast(_documents.size()); + return (int)_documents.size() ; } //Restores a Document from the given file, returns a smart //pointer to opened document. -DF_Document* DF_Application::Open(const std::string& theFileName) +DF_Document* DF_Application::Open(const std::string& /*theFileName*/) { - SALOME_UNUSED(theFileName); //Not implemented return NULL; } //Saves a Document in a given file with name theFileName -void DF_Application::SaveAs(const DF_Document* theDocument, const std::string& theFileName) +void DF_Application::SaveAs(const DF_Document* /*theDocument*/, const std::string& /*theFileName*/) { - SALOME_UNUSED(theDocument); - SALOME_UNUSED(theFileName); //Not implemented } diff --git a/src/DF/DF_Document.cxx b/src/DF/DF_Document.cxx index 3715506eb..cd9134806 100644 --- a/src/DF/DF_Document.cxx +++ b/src/DF/DF_Document.cxx @@ -21,7 +21,6 @@ #include "DF_Document.hxx" #include "DF_Label.hxx" #include "DF_ChildIterator.hxx" -#include "Basics_Utils.hxx" //Class DF_Document is container for user's data stored as a tree of Labels //with assigned Attributes @@ -131,9 +130,8 @@ void DF_Document::SetModified(bool isModified) //Restores a content of the Document from the std::string theData -void DF_Document::Load(const std::string& theData) +void DF_Document::Load(const std::string& /*theData*/) { - SALOME_UNUSED(theData); //Not implemented } diff --git a/src/DF/DF_Document.hxx b/src/DF/DF_Document.hxx index 23201960a..6619f3470 100644 --- a/src/DF/DF_Document.hxx +++ b/src/DF/DF_Document.hxx @@ -34,7 +34,7 @@ public: //Constructor Standard_EXPORT DF_Document(const std::string& theDocumentType); - Standard_EXPORT ~DF_Document(); + Standard_EXPORT virtual ~DF_Document(); Standard_EXPORT DF_Application* GetApplication(); diff --git a/src/DSC/DSC_Basic/DSC_i.hxx b/src/DSC/DSC_Basic/DSC_i.hxx index 255efaad4..0650c304a 100644 --- a/src/DSC/DSC_Basic/DSC_i.hxx +++ b/src/DSC/DSC_Basic/DSC_i.hxx @@ -73,7 +73,7 @@ public: virtual void add_provides_port(Ports::Port_ptr ref, const char* provides_port_name, Ports::PortProperties_ptr port_prop) - noexcept { + { Engines_DSC_interface::add_provides_port(ref, provides_port_name, port_prop); @@ -85,7 +85,7 @@ public: virtual void add_uses_port(const char* repository_id, const char* uses_port_name, Ports::PortProperties_ptr port_prop) - noexcept { + { Engines_DSC_interface::add_uses_port(repository_id, uses_port_name, port_prop); @@ -96,7 +96,7 @@ public: */ virtual Ports::Port_ptr get_provides_port(const char* provides_port_name, const CORBA::Boolean connection_error) - noexcept { + { return Engines_DSC_interface::get_provides_port(provides_port_name, connection_error); } @@ -105,7 +105,7 @@ public: * \see Engines::DSC::get_uses_port */ virtual Engines::DSC::uses_port * get_uses_port(const char* uses_port_name) - noexcept { + { return Engines_DSC_interface::get_uses_port(uses_port_name); } @@ -113,7 +113,7 @@ public: * \see Engines::DSC::connect_provides_port */ virtual void connect_provides_port(const char* provides_port_name) - noexcept { + { Engines_DSC_interface::connect_provides_port(provides_port_name); } @@ -122,16 +122,16 @@ public: */ virtual void connect_uses_port(const char* uses_port_name, Ports::Port_ptr provides_port_ref) - noexcept { - Engines_DSC_interface::connect_uses_port(uses_port_name, - provides_port_ref); - } + { + Engines_DSC_interface::connect_uses_port(uses_port_name, + provides_port_ref); + } /*! * \see Engines::DSC::is_connected */ virtual CORBA::Boolean is_connected(const char* port_name) - noexcept { + { return Engines_DSC_interface::is_connected(port_name); } @@ -140,7 +140,7 @@ public: */ virtual void disconnect_provides_port(const char* provides_port_name, const Engines::DSC::Message message) - noexcept { + { Engines_DSC_interface::disconnect_provides_port(provides_port_name, message); } @@ -151,7 +151,7 @@ public: virtual void disconnect_uses_port(const char* uses_port_name, Ports::Port_ptr provides_port_ref, const Engines::DSC::Message message) - noexcept { + { Engines_DSC_interface::disconnect_uses_port(uses_port_name, provides_port_ref, message); @@ -161,7 +161,7 @@ public: * \see Engines::DSC::get_port_properties */ virtual Ports::PortProperties_ptr get_port_properties(const char* port_name) - noexcept { + { return Engines_DSC_interface::get_port_properties(port_name); } }; diff --git a/src/DSC/DSC_Basic/DSC_interface.cxx b/src/DSC/DSC_Basic/DSC_interface.cxx index ccf86c0fd..ccb2bcbd8 100644 --- a/src/DSC/DSC_Basic/DSC_interface.cxx +++ b/src/DSC/DSC_Basic/DSC_interface.cxx @@ -51,7 +51,6 @@ void Engines_DSC_interface::add_provides_port(Ports::Port_ptr ref, const char* provides_port_name, Ports::PortProperties_ptr port_prop) - noexcept { // Method args test assert(provides_port_name); @@ -80,7 +79,6 @@ void Engines_DSC_interface::add_uses_port(const char* repository_id, const char* uses_port_name, Ports::PortProperties_ptr port_prop) - noexcept { // Method args test // Note : We can't be shure that repository id @@ -110,7 +108,6 @@ Engines_DSC_interface::add_uses_port(const char* repository_id, Ports::Port_ptr Engines_DSC_interface::get_provides_port(const char* provides_port_name, const CORBA::Boolean connection_error) - noexcept { // Method arg test assert(provides_port_name); @@ -143,7 +140,6 @@ Engines_DSC_interface::get_provides_port(const char* provides_port_name, Engines::DSC::uses_port * Engines_DSC_interface::get_uses_port(const char* uses_port_name) -noexcept { // Method arg test assert(uses_port_name); @@ -181,7 +177,6 @@ noexcept void Engines_DSC_interface::connect_provides_port(const char* provides_port_name) -noexcept { // Method arg test assert(provides_port_name); @@ -206,7 +201,6 @@ noexcept void Engines_DSC_interface::connect_uses_port(const char* uses_port_name, Ports::Port_ptr provides_port_ref) - noexcept { // Method arg test assert(uses_port_name); @@ -255,7 +249,6 @@ Engines_DSC_interface::connect_uses_port(const char* uses_port_name, CORBA::Boolean Engines_DSC_interface::is_connected(const char* port_name) -noexcept { CORBA::Boolean rtn = false; @@ -276,7 +269,6 @@ noexcept void Engines_DSC_interface::disconnect_provides_port(const char* provides_port_name, const Engines::DSC::Message message) - noexcept { // Method args test assert(provides_port_name); @@ -303,7 +295,6 @@ void Engines_DSC_interface::disconnect_uses_port(const char* uses_port_name, Ports::Port_ptr provides_port_ref, const Engines::DSC::Message message) - noexcept { // Method args test assert(uses_port_name); @@ -368,7 +359,6 @@ Engines_DSC_interface::disconnect_uses_port(const char* uses_port_name, Ports::PortProperties_ptr Engines_DSC_interface::get_port_properties(const char* port_name) -noexcept { Ports::PortProperties_ptr rtn_properties = Ports::PortProperties::_nil(); diff --git a/src/DSC/DSC_Basic/DSC_interface.hxx b/src/DSC/DSC_Basic/DSC_interface.hxx index 0cffb8b74..bbdbcd87f 100644 --- a/src/DSC/DSC_Basic/DSC_interface.hxx +++ b/src/DSC/DSC_Basic/DSC_interface.hxx @@ -52,29 +52,25 @@ public: */ virtual void add_provides_port(Ports::Port_ptr ref, const char* provides_port_name, - Ports::PortProperties_ptr port_prop) - noexcept; + Ports::PortProperties_ptr port_prop); /*! * \see Engines::DSC::add_uses_port */ virtual void add_uses_port(const char* repository_id, const char* uses_port_name, - Ports::PortProperties_ptr port_prop) - noexcept; + Ports::PortProperties_ptr port_prop); /*! * \see Engines::DSC::get_provides_port */ virtual Ports::Port_ptr get_provides_port(const char* provides_port_name, - const CORBA::Boolean connection_error) - noexcept; + const CORBA::Boolean connection_error); /*! * \see Engines::DSC::get_uses_port */ - virtual Engines::DSC::uses_port * get_uses_port(const char* uses_port_name) - noexcept; + virtual Engines::DSC::uses_port * get_uses_port(const char* uses_port_name); /*! * \see Engines::DSC::connect_provides_port @@ -84,8 +80,7 @@ public: * port doesn't know its uses ports references. It's framework or application role * to manage connections between ports. */ - virtual void connect_provides_port(const char* provides_port_name) - noexcept; + virtual void connect_provides_port(const char* provides_port_name); /*! * \see Engines::DSC::connect_uses_port @@ -94,14 +89,12 @@ public: * port how much provides ports are connected with. */ virtual void connect_uses_port(const char* uses_port_name, - Ports::Port_ptr provides_port_ref) - noexcept; + Ports::Port_ptr provides_port_ref); /*! * \see Engines::DSC::is_connected */ - virtual CORBA::Boolean is_connected(const char* port_name) - noexcept; + virtual CORBA::Boolean is_connected(const char* port_name); /*! * \see Engines::DSC::disconnect_provides_port @@ -112,8 +105,7 @@ public: * to manage connections between ports. */ virtual void disconnect_provides_port(const char* provides_port_name, - const Engines::DSC::Message message) - noexcept; + const Engines::DSC::Message message); /*! * \see Engines::DSC::disconnect_uses_port @@ -128,14 +120,12 @@ public: */ virtual void disconnect_uses_port(const char* uses_port_name, Ports::Port_ptr provides_port_ref, - const Engines::DSC::Message message) - noexcept; + const Engines::DSC::Message message); /*! * \see Engines::DSC::get_port_properties */ - virtual Ports::PortProperties_ptr get_port_properties(const char* port_name) - noexcept; + virtual Ports::PortProperties_ptr get_port_properties(const char* port_name); static void writeEvent(const char* request,const std::string& containerName, const char* instance_name, const char* port_name, const char* error, const char* message); diff --git a/src/DSC/DSC_Basic/PortProperties_i.cxx b/src/DSC/DSC_Basic/PortProperties_i.cxx index 9f18fb684..b9e5dbea7 100644 --- a/src/DSC/DSC_Basic/PortProperties_i.cxx +++ b/src/DSC/DSC_Basic/PortProperties_i.cxx @@ -31,8 +31,7 @@ PortProperties_i::PortProperties_i() {} PortProperties_i::~PortProperties_i() {} void -PortProperties_i::set_property(const char * /*name*/, const CORBA::Any& /*value*/) -noexcept +PortProperties_i::set_property(const char* /*name*/, const CORBA::Any& /*value*/) { // Default case, the object has no properties. throw Ports::NotDefined(); @@ -40,7 +39,6 @@ noexcept CORBA::Any* PortProperties_i::get_property(const char* /*name*/) -noexcept { // Default case, the object has no properties. throw Ports::NotDefined(); diff --git a/src/DSC/DSC_Basic/PortProperties_i.hxx b/src/DSC/DSC_Basic/PortProperties_i.hxx index 778b21686..b5887d71c 100644 --- a/src/DSC/DSC_Basic/PortProperties_i.hxx +++ b/src/DSC/DSC_Basic/PortProperties_i.hxx @@ -46,16 +46,14 @@ class DSC_BASIC_EXPORT PortProperties_i: * CORBA method : set a value to a property * \see Ports::PortProperties::set_property */ - virtual void set_property(const char * /*name*/, - const CORBA::Any& /*value*/) - noexcept; + virtual void set_property(const char* name, + const CORBA::Any& value); /*! * CORBA method : get the value of a property * \see Ports::PortProperties::get_property */ - virtual CORBA::Any* get_property(const char* /*name*/) - noexcept; + virtual CORBA::Any* get_property(const char* name); }; #endif diff --git a/src/DSC/DSC_Python/CMakeLists.txt b/src/DSC/DSC_Python/CMakeLists.txt index 863d3fda7..d9a6cd6ab 100644 --- a/src/DSC/DSC_Python/CMakeLists.txt +++ b/src/DSC/DSC_Python/CMakeLists.txt @@ -17,7 +17,6 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -FIND_PACKAGE(SWIG REQUIRED) INCLUDE(${SWIG_USE_FILE}) SET_SOURCE_FILES_PROPERTIES(calcium.i PROPERTIES CPLUSPLUS ON) diff --git a/src/DSC/DSC_User/DSC_Exception.hxx b/src/DSC/DSC_User/DSC_Exception.hxx index c44cf2560..b9c498c03 100644 --- a/src/DSC/DSC_User/DSC_Exception.hxx +++ b/src/DSC/DSC_User/DSC_Exception.hxx @@ -140,7 +140,7 @@ struct DSC_Exception : public SALOME_Exception { // Le destructeur de la SALOME_Exception devrait être virtuel // sinon pb avec nos attributs de type pointeur. - virtual ~DSC_Exception(void) {}; + virtual ~DSC_Exception(void) noexcept {}; virtual const std::string & getExceptionName() const {return _exceptionName;}; @@ -170,12 +170,12 @@ protected: ) : DSC_Exception(text,fileName,lineNumber,funcName) { \ _exceptionName = #Derived; \ } \ - virtual ~Derived(void);\ + virtual ~Derived(void) noexcept;\ };\ //Sert à eviter le problème d'identification RTTI des exceptions //Crée un unique typeInfo pour tous les bibliothèques composants SALOME //dans un fichier cxx -#define DSC_EXCEPTION_CXX(NameSpace,Derived) NameSpace::Derived::~Derived(void) {} +#define DSC_EXCEPTION_CXX(NameSpace,Derived) NameSpace::Derived::~Derived(void) noexcept {} #endif /* DSC_EXCEPTION_HXX */ diff --git a/src/DSC/DSC_User/Datastream/Calcium/CalciumException.hxx b/src/DSC/DSC_User/Datastream/Calcium/CalciumException.hxx index cb515955a..dc8c31241 100644 --- a/src/DSC/DSC_User/Datastream/Calcium/CalciumException.hxx +++ b/src/DSC/DSC_User/Datastream/Calcium/CalciumException.hxx @@ -56,7 +56,7 @@ struct CalciumException : public DSC_Exception { DSC_Exception(ex),_info(info),_exceptionName("CalciumException") {}; - virtual ~CalciumException() {}; + virtual ~CalciumException() noexcept {}; CalciumTypes::InfoType getInfo() const { return _info;} void setInfo(CalciumTypes::InfoType info) {_info=info;} virtual const std::string & getExceptionName() const {return _exceptionName;}; diff --git a/src/DSC/DSC_User/Datastream/Calcium/CalciumGenericProvidesPort.hxx b/src/DSC/DSC_User/Datastream/Calcium/CalciumGenericProvidesPort.hxx index 16f03573d..c6176aae6 100644 --- a/src/DSC/DSC_User/Datastream/Calcium/CalciumGenericProvidesPort.hxx +++ b/src/DSC/DSC_User/Datastream/Calcium/CalciumGenericProvidesPort.hxx @@ -139,11 +139,9 @@ return POA_Ports::PortProperties::_this(); \ } \ \ - virtual void set_property(const char * name, const CORBA::Any& value) \ - ; \ + virtual void set_property(const char * name, const CORBA::Any& value); \ \ - virtual CORBA::Any* get_property(const char* name) \ - ; \ + virtual CORBA::Any* get_property(const char* name); \ \ virtual void provides_port_changed(int /*connection_nbr*/, \ const Engines::DSC::Message message) { \ @@ -172,7 +170,7 @@ specificPortName::~specificPortName(void) {} \ \ void specificPortName::set_property(const char * name, const CORBA::Any& value) \ - { \ + { \ \ const std::string key(name); \ CORBA::Long sl; \ @@ -215,7 +213,7 @@ \ \ CORBA::Any* specificPortName::get_property(const char* name) \ - { \ + { \ const std::string key(name); \ CORBA::Any* value=new CORBA::Any; \ if (key == "StorageLevel" ) \ diff --git a/src/DSC/DSC_User/Superv_Component_i.cxx b/src/DSC/DSC_User/Superv_Component_i.cxx index a5f81188f..d8c2999fe 100644 --- a/src/DSC/DSC_User/Superv_Component_i.cxx +++ b/src/DSC/DSC_User/Superv_Component_i.cxx @@ -45,10 +45,9 @@ Superv_Component_i::Superv_Component_i(CORBA::ORB_ptr orb, PortableServer::ObjectId * contId, const char *instanceName, const char *interfaceName, - bool notif) : + bool /*notif*/) : Engines_DSC_i(orb, poa, contId, instanceName, interfaceName) { - SALOME_UNUSED(notif); #ifdef MYDEBUG std::cerr << "--Superv_Component_i : MARK 1 ---- " << instanceName << "----" << std::endl; #endif @@ -315,8 +314,8 @@ Superv_Component_i::uses_port_changed(const char* uses_port_name, void Superv_Component_i::get_uses_port_names(std::vector & port_names, - const std::string servicename) const { - SALOME_UNUSED(servicename); + const std::string /*servicename*/) const +{ port_names.reserve(my_superv_ports.size()); superv_ports::const_iterator it; diff --git a/src/DSC/DSC_User/Superv_Component_i.hxx b/src/DSC/DSC_User/Superv_Component_i.hxx index 43aa45b5e..8d1e18f5f 100644 --- a/src/DSC/DSC_User/Superv_Component_i.hxx +++ b/src/DSC/DSC_User/Superv_Component_i.hxx @@ -32,7 +32,6 @@ #include "uses_port.hxx" #include "provides_port.hxx" #include "port_factory.hxx" -#include "Basics_Utils.hxx" #include "DSC_Exception.hxx" #include @@ -93,8 +92,8 @@ public: /*! * \warning currently disabled. */ - virtual provides_port * create_provides_data_and_control_port(const char* port_type) - {SALOME_UNUSED(port_type);return NULL;} + virtual provides_port * create_provides_data_and_control_port(const char* /*port_type*/) + {return NULL;} /*! * \warning currently disabled. @@ -105,8 +104,8 @@ public: /*! * \warning currently disabled. */ - virtual uses_port * create_uses_data_and_control_port(const char* port_type) - {SALOME_UNUSED(port_type);return NULL;} + virtual uses_port * create_uses_data_and_control_port(const char* /*port_type*/) + {return NULL;} /*! * This method permits to create a provides port provided by the platform. @@ -118,8 +117,7 @@ public: * * \note It's user repsonsability to destroy the provides port. */ - virtual provides_port * create_provides_data_port(const std::string& port_fab_type) - ; + virtual provides_port * create_provides_data_port(const std::string& port_fab_type); /*! @@ -132,8 +130,7 @@ public: * * \note It's user repsonsability to destroy the uses port. */ - virtual uses_port * create_uses_data_port(const std::string& port_fab_type) - ; + virtual uses_port * create_uses_data_port(const std::string& port_fab_type); /*! * Adds a port to the component. With this method only Salomé's provided DSC ports @@ -145,8 +142,7 @@ public: */ virtual void add_port(const char * port_fab_type, const char * port_type, - const char * port_name) - ; + const char * port_name); /*! * Adds a port to the component. With this method only Salomé's provided DSC ports @@ -160,8 +156,7 @@ public: template < typename SpecificPortType > SpecificPortType * add_port(const char * port_fab_type, const char * port_type, - const char * port_name) - ; + const char * port_name); /*! * Adds a created provides port to the component. @@ -170,8 +165,7 @@ public: * \param provides_port_name the name of the port in the component. */ virtual void add_port(provides_port * port, - const char* provides_port_name) - ; + const char* provides_port_name); /*! * Adds a created uses port to the component. @@ -180,8 +174,7 @@ public: * \param uses_port_name the name of the port in the component. */ virtual void add_port(uses_port * port, - const char* uses_port_name) - ; + const char* uses_port_name); /*! * Gets the provides port already added in the component. @@ -190,8 +183,7 @@ public: * \param provides_port_name the name of the port. */ virtual void get_port(provides_port *& port, - const char* provides_port_name) - ; + const char* provides_port_name); /*! * Gets the uses port already added in the component. @@ -200,8 +192,7 @@ public: * \param uses_port_name the name of the port. */ virtual void get_port(uses_port *& port, - const char* uses_port_name) - ; + const char* uses_port_name); /*! * Gets the list of the ports of a service. @@ -221,8 +212,7 @@ public: * \return a port's pointer. */ template - SpecificPortType * get_port( const char * port_name) - ; + SpecificPortType * get_port( const char * port_name); /*! * \see DSC_Callbacks::provides_port_changed @@ -267,11 +257,9 @@ public: // This method is implemented by default since it is a very specific usage. // It also permits to not break compatibility with older components. - virtual CORBA::Boolean init_service_with_multiple(const char* service_name, - const Engines::Superv_Component::seq_multiple_param & params) + virtual CORBA::Boolean init_service_with_multiple(const char* /*service_name*/, + const Engines::Superv_Component::seq_multiple_param & /*params*/) { - SALOME_UNUSED(service_name); - SALOME_UNUSED(params); return true; } diff --git a/src/DSC/ParallelDSC/ParallelDSC_i.hxx b/src/DSC/ParallelDSC/ParallelDSC_i.hxx index 157facf33..3c55a9a73 100644 --- a/src/DSC/ParallelDSC/ParallelDSC_i.hxx +++ b/src/DSC/ParallelDSC/ParallelDSC_i.hxx @@ -57,7 +57,7 @@ public: virtual void add_provides_port(Ports::Port_ptr ref, const char* provides_port_name, Ports::PortProperties_ptr port_prop) - { + { Engines_DSC_interface::add_provides_port(ref, provides_port_name, port_prop); @@ -69,7 +69,7 @@ public: virtual void add_uses_port(const char* repository_id, const char* uses_port_name, Ports::PortProperties_ptr port_prop) - { + { Engines_DSC_interface::add_uses_port(repository_id, uses_port_name, port_prop); @@ -80,7 +80,7 @@ public: */ virtual Ports::Port_ptr get_provides_port(const char* provides_port_name, const CORBA::Boolean connection_error) - { + { return Engines_DSC_interface::get_provides_port(provides_port_name, connection_error); } @@ -89,7 +89,7 @@ public: * \see Engines::DSC::get_uses_port */ virtual Engines::DSC::uses_port * get_uses_port(const char* uses_port_name) - { + { return Engines_DSC_interface::get_uses_port(uses_port_name); } @@ -97,7 +97,7 @@ public: * \see Engines::DSC::connect_provides_port */ virtual void connect_provides_port(const char* provides_port_name) - { + { Engines_DSC_interface::connect_provides_port(provides_port_name); } @@ -106,16 +106,16 @@ public: */ virtual void connect_uses_port(const char* uses_port_name, Ports::Port_ptr provides_port_ref) - { - Engines_DSC_interface::connect_uses_port(uses_port_name, - provides_port_ref); - } + { + Engines_DSC_interface::connect_uses_port(uses_port_name, + provides_port_ref); + } /*! * \see Engines::DSC::is_connected */ virtual CORBA::Boolean is_connected(const char* port_name) - { + { return Engines_DSC_interface::is_connected(port_name); } @@ -124,7 +124,7 @@ public: */ virtual void disconnect_provides_port(const char* provides_port_name, const Engines::DSC::Message message) - { + { Engines_DSC_interface::disconnect_provides_port(provides_port_name, message); } @@ -135,14 +135,14 @@ public: virtual void disconnect_uses_port(const char* uses_port_name, Ports::Port_ptr provides_port_ref, const Engines::DSC::Message message) - { + { Engines_DSC_interface::disconnect_uses_port(uses_port_name, provides_port_ref, message); } virtual Ports::PortProperties_ptr get_port_properties(const char* port_name) - { + { return Engines_DSC_interface::get_port_properties(port_name); } diff --git a/src/HDFPersist/HDFascii.cc b/src/HDFPersist/HDFascii.cc index b18693058..063fc52f5 100644 --- a/src/HDFPersist/HDFascii.cc +++ b/src/HDFPersist/HDFascii.cc @@ -258,13 +258,13 @@ void SaveDatasetInASCIIfile(HDFdataset *hdf_dataset, FILE* fp, int ident) fprintf(fp, " %li\n", ndim); for(int i = 0;i < ndim;i++) { - fprintf(fp, " %li", dim[i]); + fprintf(fp, " %lu", (unsigned long)dim[i]); } fprintf(fp, "\n"); delete [] dim; - fprintf(fp, "%i %i:", size, order); + fprintf(fp, "%li %i:", size, order); if( type == HDF_ARRAY ) { HDFarray *array = new HDFarray(hdf_dataset); hdf_type data_type = array->GetDataType(); @@ -278,7 +278,7 @@ void SaveDatasetInASCIIfile(HDFdataset *hdf_dataset, FILE* fp, int ident) array->GetDim(arr_dim); for( int i = 0;i < arr_ndim; i++ ) { - fprintf(fp, " %i", arr_dim[i]); + fprintf(fp, " %lu", (unsigned long)arr_dim[i]); } //And write the data array @@ -308,9 +308,8 @@ void SaveDatasetInASCIIfile(HDFdataset *hdf_dataset, FILE* fp, int ident) // function : SaveAttributeInASCIIfile // purpose : //============================================================================ -void SaveAttributeInASCIIfile(HDFattribute *hdf_attribute, FILE* fp, int ident) +void SaveAttributeInASCIIfile(HDFattribute *hdf_attribute, FILE* fp, int /*ident*/) { - SALOME_UNUSED(ident); hdf_attribute->OpenOnDisk(); hdf_type type = hdf_attribute->GetType(); @@ -319,7 +318,7 @@ void SaveAttributeInASCIIfile(HDFattribute *hdf_attribute, FILE* fp, int ident) size_t size = hdf_attribute->GetSize(); fprintf(fp, "%s\n", ATTRIBUTE_ID); - fprintf(fp, "%s %i %i\n", name, type, size); + fprintf(fp, "%s %i %lu\n", name, type, size); delete [] name; @@ -504,8 +503,8 @@ bool CreateGroupFromASCII(HDFcontainerObject *father, FILE *fp) bool CreateDatasetFromASCII(HDFcontainerObject *father, FILE *fp) { char name[HDF_NAME_MAX_LEN+1]; - hdf_type type; - hdf_byte_order order; + int type; + int order; int nbDim, nbAttr; long i, size; @@ -535,7 +534,7 @@ bool CreateDatasetFromASCII(HDFcontainerObject *father, FILE *fp) HDFarray* anArray = 0; if( type == HDF_ARRAY ){ //Get array information - hdf_type arr_data_type; + int arr_data_type; int arr_ndim; fscanf(fp, "%c", &tmp); fscanf(fp, " %i\n", &arr_data_type ); //Get array data type @@ -547,14 +546,14 @@ bool CreateDatasetFromASCII(HDFcontainerObject *father, FILE *fp) fscanf(fp, " %i", &tdim); arr_dim[i] = tdim; } - anArray = new HDFarray(0, arr_data_type, arr_ndim, arr_dim); + anArray = new HDFarray(0, (hdf_type)arr_data_type, arr_ndim, arr_dim); anArray->CreateOnDisk(); type = arr_data_type; delete [] arr_dim; } - HDFdataset* hdf_dataset = new HDFdataset(new_name, father, anArray ? HDF_ARRAY : type, sizeArray, nbDim, order); + HDFdataset* hdf_dataset = new HDFdataset(new_name, father, anArray ? HDF_ARRAY : (hdf_type)type, sizeArray, nbDim, (hdf_byte_order)order); if(anArray) hdf_dataset->SetArrayId(anArray->GetId()); @@ -593,7 +592,7 @@ bool CreateDatasetFromASCII(HDFcontainerObject *father, FILE *fp) } else if(type == HDF_CHAR) { hdf_char* val = new hdf_char[size]; for(i=0; iWriteOnDisk(val); delete [] val; @@ -642,11 +641,11 @@ bool CreateAttributeFromASCII(HDFinternalObject *father, FILE* fp) { char name[HDF_NAME_MAX_LEN+1]; - hdf_type type; + int type; int size; fscanf(fp, "%s %i %i\n", name, &type, &size); char* new_name = restoreName(name); - HDFattribute* hdf_attribute = new HDFattribute(new_name, father, type, size); + HDFattribute* hdf_attribute = new HDFattribute(new_name, father, (hdf_type)type, size); hdf_attribute->CreateOnDisk(); @@ -791,7 +790,7 @@ char* restoreName(char* name) void write_float64(FILE* fp, hdf_float64* value) { unsigned char* array = (unsigned char*)value; - for(int i = 0; i < sizeof(hdf_float64); i++) { + for(int i = 0; i < (int)sizeof(hdf_float64); i++) { unsigned tmp = (unsigned short)array[i]; fprintf(fp, " %2x", tmp); } @@ -800,7 +799,7 @@ void write_float64(FILE* fp, hdf_float64* value) void read_float64(FILE* fp, hdf_float64* value) { unsigned char* array = (unsigned char*)value; - for(int i = 0; i < sizeof(hdf_float64); i++) { + for(int i = 0; i < (int)sizeof(hdf_float64); i++) { unsigned tmp; fscanf(fp, " %x", &tmp); array[i] = (unsigned char)tmp; diff --git a/src/HDFPersist/HDFcontainerObject.cc b/src/HDFPersist/HDFcontainerObject.cc index d3543350a..dfbaec5aa 100644 --- a/src/HDFPersist/HDFcontainerObject.cc +++ b/src/HDFPersist/HDFcontainerObject.cc @@ -27,7 +27,6 @@ #include "hdfi.h" #include "HDFcontainerObject.hxx" #include "HDFexception.hxx" -#include "Basics_Utils.hxx" HDFcontainerObject::HDFcontainerObject(const char *name) : HDFinternalObject(name) @@ -53,9 +52,8 @@ int HDFcontainerObject::nInternalObjects() return 0; } -void HDFcontainerObject::InternalObjectIndentify(int rank, char *object_name) +void HDFcontainerObject::InternalObjectIndentify(int /*rank*/, char *object_name) { - SALOME_UNUSED(rank); object_name = NULL; } diff --git a/src/HDFPersist/HDFconvert.cc b/src/HDFPersist/HDFconvert.cc index e2c74e2f5..3948c5004 100644 --- a/src/HDFPersist/HDFconvert.cc +++ b/src/HDFPersist/HDFconvert.cc @@ -122,6 +122,5 @@ int HDFConvert::FromAscii(const std::string& file, const HDFcontainerObject & hd return -1; }; - // TODO: return or ? - return static_cast(length); + return (int)length; } diff --git a/src/HDFPersist/HDFdataset.cc b/src/HDFPersist/HDFdataset.cc index 7f9ffd540..56e56dc06 100644 --- a/src/HDFPersist/HDFdataset.cc +++ b/src/HDFPersist/HDFdataset.cc @@ -29,13 +29,11 @@ #include "HDFdataset.hxx" #include "HDFcontainerObject.hxx" #include "HDFexception.hxx" -#include "Basics_Utils.hxx" #include -herr_t dataset_attr(hid_t loc_id, const char *attr_name, void *operator_data) +herr_t dataset_attr(hid_t /*loc_id*/, const char *attr_name, void *operator_data) { - SALOME_UNUSED(loc_id); *(char**)operator_data = new char[strlen(attr_name)+1]; strcpy(*(char**)operator_data, attr_name); return 1; diff --git a/src/HDFPersist/HDFfile.cc b/src/HDFPersist/HDFfile.cc index 398aeb9eb..25d26932b 100644 --- a/src/HDFPersist/HDFfile.cc +++ b/src/HDFPersist/HDFfile.cc @@ -36,11 +36,9 @@ #include #include "HDFfile.hxx" #include "HDFexception.hxx" -#include "Basics_Utils.hxx" -herr_t file_attr(hid_t loc_id, const char *attr_name, void *operator_data) +herr_t file_attr(hid_t /*loc_id*/, const char *attr_name, void *operator_data) { - SALOME_UNUSED(loc_id); *(char**)operator_data = new char[strlen(attr_name)+1]; strcpy(*(char**)operator_data, attr_name); return 1; diff --git a/src/HDFPersist/HDFgroup.cc b/src/HDFPersist/HDFgroup.cc index e6c888e33..3c9dbe36f 100644 --- a/src/HDFPersist/HDFgroup.cc +++ b/src/HDFPersist/HDFgroup.cc @@ -28,11 +28,9 @@ #include #include "HDFgroup.hxx" #include "HDFexception.hxx" -#include "Basics_Utils.hxx" -herr_t group_attr(hid_t loc_id, const char *attr_name, void *operator_data) +herr_t group_attr(hid_t /*loc_id*/, const char *attr_name, void *operator_data) { - SALOME_UNUSED(loc_id); *(char**)operator_data = new char[strlen(attr_name)+1]; strcpy(*(char**)operator_data, attr_name); return 1; diff --git a/src/HDFPersist/HDFnObjects.c b/src/HDFPersist/HDFnObjects.c index 1b5d20e9b..b1855fb56 100644 --- a/src/HDFPersist/HDFnObjects.c +++ b/src/HDFPersist/HDFnObjects.c @@ -1,24 +1,24 @@ -// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// +/* Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE + * + * Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, + * CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + */ /*---------------------------------------------------------------------------- SALOME HDFPersist : implementation of HDF persitent ( save/ restore ) @@ -28,6 +28,7 @@ SALOME HDFPersist : implementation of HDF persitent ( save/ restore ) #include "hdfi.h" #include + /* * - Name : HDFnObjects * - Description : returns the number of HDF objects in an HDF group @@ -60,6 +61,7 @@ hdf_err Num(hdf_idt id,const char *name, void *data) int *count; (void)name; (void)id; + count = (int *) data; (*count)++; diff --git a/src/HDFPersist/HDFobjectIdentify.c b/src/HDFPersist/HDFobjectIdentify.c index 7d846a1ef..ffaa51756 100644 --- a/src/HDFPersist/HDFobjectIdentify.c +++ b/src/HDFPersist/HDFobjectIdentify.c @@ -1,24 +1,24 @@ -// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// +/* Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE + * + * Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, + * CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + */ /*---------------------------------------------------------------------------- SALOME HDFPersist : implementation of HDF persitent ( save/ restore ) @@ -60,6 +60,7 @@ hdf_err HDFobjectIdentify(hdf_idt fid,const char *path,int i,char *name) hdf_err RankInfo(hdf_idt id, const char *name, void *data) { (void)id; + if ( data ) strcpy( (char*)data, name ); else diff --git a/src/HDFPersist/HDFtypes.h b/src/HDFPersist/HDFtypes.h index 3c3c43c3e..0c4217940 100644 --- a/src/HDFPersist/HDFtypes.h +++ b/src/HDFPersist/HDFtypes.h @@ -1,24 +1,24 @@ -// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// +/* Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE + * + * Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, + * CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + */ /*---------------------------------------------------------------------------------- SALOME HDFPersist : implementation of HDF persitent ( save/ restore ) diff --git a/src/HDFPersist/hdfi.h b/src/HDFPersist/hdfi.h index 01fc494ba..7c255ff87 100644 --- a/src/HDFPersist/hdfi.h +++ b/src/HDFPersist/hdfi.h @@ -1,24 +1,24 @@ -// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// +/* Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE + * + * Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, + * CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + */ /*---------------------------------------------------------------------- SALOME HDFPersist : implementation of HDF persitent ( save/ restore ) diff --git a/src/KernelHelpers/SALOMEDS_DriverDefaultImpl.hxx b/src/KernelHelpers/SALOMEDS_DriverDefaultImpl.hxx index 58f8a1f04..d36feeca3 100644 --- a/src/KernelHelpers/SALOMEDS_DriverDefaultImpl.hxx +++ b/src/KernelHelpers/SALOMEDS_DriverDefaultImpl.hxx @@ -40,11 +40,11 @@ class KERNELHELPERS_EXPORT SALOMEDS_DriverDefaultImpl: SALOMEDS_DriverDefaultImpl(); public: - SALOMEDS_DriverDefaultImpl(CORBA::ORB_ptr /*orb*/, - PortableServer::POA_ptr /*poa*/, - PortableServer::ObjectId * /*contId*/, - const char * /*instanceName*/, - const char * /*interfaceName*/); + SALOMEDS_DriverDefaultImpl(CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId * contId, + const char * instanceName, + const char * interfaceName); virtual ~SALOMEDS_DriverDefaultImpl(); @@ -54,13 +54,13 @@ class KERNELHELPERS_EXPORT SALOMEDS_DriverDefaultImpl: //--------------------------------------------- //virtual SALOMEDS::TMPFile* Save(SALOMEDS::SComponent_ptr theComponent, - SALOMEDS::TMPFile* Save(SALOMEDS::SComponent_ptr /*theComponent*/, - const char* /*theURL*/, - bool /*isMultiFile*/); + SALOMEDS::TMPFile* Save(SALOMEDS::SComponent_ptr theComponent, + const char* theURL, + bool isMultiFile); - virtual SALOMEDS::TMPFile* SaveASCII(SALOMEDS::SComponent_ptr /*theComponent*/, - const char* /*theURL*/, - bool /*isMultiFile*/); + virtual SALOMEDS::TMPFile* SaveASCII(SALOMEDS::SComponent_ptr theComponent, + const char* theURL, + bool isMultiFile); virtual bool Load(SALOMEDS::SComponent_ptr, const SALOMEDS::TMPFile &, @@ -72,36 +72,36 @@ class KERNELHELPERS_EXPORT SALOMEDS_DriverDefaultImpl: const char* theURL, bool isMultiFile); - virtual void Close(SALOMEDS::SComponent_ptr /*IORSComponent*/); + virtual void Close(SALOMEDS::SComponent_ptr IORSComponent); virtual char* ComponentDataType(); - virtual char* IORToLocalPersistentID(SALOMEDS::SObject_ptr /*theSObject*/, - const char* /*IORString*/, - CORBA::Boolean /*isMultiFile*/, - CORBA::Boolean /*isASCII*/); + virtual char* IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, + const char* IORString, + CORBA::Boolean isMultiFile, + CORBA::Boolean isASCII); - virtual char* LocalPersistentIDToIOR(SALOMEDS::SObject_ptr /*theSObject*/, - const char* /*aLocalPersistentID*/, - CORBA::Boolean /*isMultiFile*/, - CORBA::Boolean /*isASCII*/); + virtual char* LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject, + const char* aLocalPersistentID, + CORBA::Boolean isMultiFile, + CORBA::Boolean isASCII); - virtual bool CanPublishInStudy(CORBA::Object_ptr /*theIOR*/); + virtual bool CanPublishInStudy(CORBA::Object_ptr theIOR); - virtual SALOMEDS::SObject_ptr PublishInStudy(SALOMEDS::SObject_ptr /*theSObject*/, - CORBA::Object_ptr /*theObject*/, - const char* /*theName*/); + virtual SALOMEDS::SObject_ptr PublishInStudy(SALOMEDS::SObject_ptr theSObject, + CORBA::Object_ptr theObject, + const char* theName); - virtual CORBA::Boolean CanCopy(SALOMEDS::SObject_ptr /*theObject*/); + virtual CORBA::Boolean CanCopy(SALOMEDS::SObject_ptr theObject); - virtual SALOMEDS::TMPFile* CopyFrom(SALOMEDS::SObject_ptr /*theObject*/, - CORBA::Long& /*theObjectID*/); + virtual SALOMEDS::TMPFile* CopyFrom(SALOMEDS::SObject_ptr theObject, + CORBA::Long& theObjectID); - virtual CORBA::Boolean CanPaste(const char* /*theComponentName*/, - CORBA::Long /*theObjectID*/); + virtual CORBA::Boolean CanPaste(const char* theComponentName, + CORBA::Long theObjectID); - virtual SALOMEDS::SObject_ptr PasteInto(const SALOMEDS::TMPFile& /*theStream*/, - CORBA::Long /*theObjectID*/, - SALOMEDS::SObject_ptr /*theObject*/); + virtual SALOMEDS::SObject_ptr PasteInto(const SALOMEDS::TMPFile& theStream, + CORBA::Long theObjectID, + SALOMEDS::SObject_ptr theObject); }; #endif diff --git a/src/Launcher/Launcher.hxx b/src/Launcher/Launcher.hxx index 490e065d5..86b8dfa91 100644 --- a/src/Launcher/Launcher.hxx +++ b/src/Launcher/Launcher.hxx @@ -112,7 +112,7 @@ protected: // Used by SALOME_Launcher std::shared_ptr _ResManager; - virtual void notifyObservers(const std::string & event_name, const std::string & event_data) { SALOME_UNUSED(event_name); SALOME_UNUSED(event_data);} + virtual void notifyObservers(const std::string & /*event_name*/, const std::string & /*event_data*/) {} int addJob(Launcher::Job * new_job); // Methods used by user interface methods diff --git a/src/Launcher/SALOME_ExternalServerLauncher.cxx b/src/Launcher/SALOME_ExternalServerLauncher.cxx index 636d2c77a..b37d9ca33 100644 --- a/src/Launcher/SALOME_ExternalServerLauncher.cxx +++ b/src/Launcher/SALOME_ExternalServerLauncher.cxx @@ -165,7 +165,7 @@ SALOME::StringVec *SALOME_ExternalServerLauncher::listServersInNS() SALOME::StringVec *ret(new SALOME::StringVec); std::vector loes(ListOfExternalServersCpp(_NS)); std::size_t sz(loes.size()); - ret->length((_CORBA_ULong)sz); //!< TODO: conversion from size_t to _CORBA_ULong + ret->length((CORBA::ULong)sz); for(auto i = 0; i<(int)sz ; i++) //TODO: mismatch signed/unsigned { (*ret)[i]=CORBA::string_dup(loes[i].c_str()); @@ -200,9 +200,9 @@ SALOME::ByteVec *SALOME_ExternalServerLauncher::fetchContentOfFileAndRm(const ch t.read(buffer.get(),size); // std::unique_ptr ret(new SALOME::ByteVec); - ret->length((_CORBA_ULong)size); //!< TODO: conversion from size_t to _CORBA_ULong + ret->length((CORBA::ULong)size); for(std::size_t i=0;ijob_file = CORBA::string_dup(job_parameters.job_file.c_str()); result->pre_command = CORBA::string_dup(job_parameters.pre_command.c_str()); result->env_file = CORBA::string_dup(job_parameters.env_file.c_str()); - result->in_files.length((_CORBA_ULong)job_parameters.in_files.size()); //!< TODO: conversion from size_t to _CORBA_ULong + result->in_files.length((CORBA::ULong)job_parameters.in_files.size()); //!< TODO: conversion from size_t to CORBA::ULong int i = 0; for(const std::string& it : job_parameters.in_files) @@ -635,7 +635,7 @@ SALOME_Launcher::JobParameters_CPP2CORBA(const JobParameters_cpp& job_parameters result->in_files[i] = CORBA::string_dup(it.c_str()); i++; } - result->out_files.length((_CORBA_ULong)job_parameters.out_files.size()); //!< TODO: conversion from size_t to _CORBA_ULong + result->out_files.length((CORBA::ULong)job_parameters.out_files.size()); //!< TODO: conversion from size_t to CORBA::ULong i = 0; for(const std::string& it : job_parameters.out_files) { @@ -661,7 +661,7 @@ SALOME_Launcher::JobParameters_CPP2CORBA(const JobParameters_cpp& job_parameters = job_parameters.specific_parameters; if (!specific_parameters.empty()) { - result->specific_parameters.length((_CORBA_ULong)specific_parameters.size()); //!< TODO: conversion from size_t to _CORBA_ULong + result->specific_parameters.length((CORBA::ULong)specific_parameters.size()); //!< TODO: conversion from size_t to CORBA::ULong CORBA::ULong i = 0; for (const auto& it_specific : specific_parameters) { diff --git a/src/Launcher_SWIG/CMakeLists.txt b/src/Launcher_SWIG/CMakeLists.txt index 92064ec7c..a98274e97 100644 --- a/src/Launcher_SWIG/CMakeLists.txt +++ b/src/Launcher_SWIG/CMakeLists.txt @@ -35,7 +35,6 @@ SET_SOURCE_FILES_PROPERTIES(Launcher.i PROPERTIES SWIG_FLAGS "-py3") INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} ${LIBBATCH_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../ResourcesManager ${CMAKE_CURRENT_SOURCE_DIR}/../Launcher ) diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx index da2a41b33..181f247e6 100644 --- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx +++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx @@ -278,11 +278,11 @@ SALOME_LifeCycleCORBA::FindOrLoad_Component(const char *containerName, // --- Check if containerName contains machine name (if yes: rg>0) char *stContainer=strdup(containerName); std::string st2Container(stContainer); - int rg=(int)st2Container.find("/"); //!< TODO: conversion from size_t to int + size_t rg=st2Container.find("/"); Engines::ContainerParameters params; preSet(params); - if (rg<0) + if (rg == std::string::npos) { // containerName doesn't contain "/" => Local container params.container_name = CORBA::string_dup(stContainer); diff --git a/src/Logger/SALOME_Trace.cxx b/src/Logger/SALOME_Trace.cxx index 6f4731375..4dedce920 100644 --- a/src/Logger/SALOME_Trace.cxx +++ b/src/Logger/SALOME_Trace.cxx @@ -26,7 +26,6 @@ // Module : SALOME // #include "SALOME_Trace.hxx" -#include "Basics_Utils.hxx" #include #include //#include @@ -135,9 +134,8 @@ int SALOME_Trace::Initialize(CORBA::ORB_ptr theOrb) { return 1; } -void SALOME_Trace::putMessage(std::ostream& msg) +void SALOME_Trace::putMessage(std::ostream& /*msg*/) { - SALOME_UNUSED(msg); //if (!isInitialized) std::cout<<"!!! SALOME_Trace is used without initialising !!!"<length(static_cast(myPrivate->_typeList.size())); + type_list->length((CORBA::ULong)myPrivate->_typeList.size()); for (unsigned int ind = 0 ; ind < myPrivate->_typeList.size() ; ind++) { @@ -343,7 +343,7 @@ SALOME_ModuleCatalog::ListOfTypeDefinition* SALOME_ModuleCatalogImpl::GetTypes() type_list[ind].kind=SALOME_ModuleCatalog::Objref; type_list[ind].id=CORBA::string_dup(myPrivate->_typeList[ind].id.c_str()); //bases - type_list[ind].bases.length(static_cast(myPrivate->_typeList[ind].bases.size())); + type_list[ind].bases.length((CORBA::ULong)myPrivate->_typeList[ind].bases.size()); std::vector::const_iterator miter; miter=myPrivate->_typeList[ind].bases.begin(); int n_memb=0; @@ -368,7 +368,7 @@ SALOME_ModuleCatalog::ListOfTypeDefinition* SALOME_ModuleCatalogImpl::GetTypes() { type_list[ind].kind=SALOME_ModuleCatalog::Struc; //members - type_list[ind].members.length(static_cast(myPrivate->_typeList[ind].members.size())); + type_list[ind].members.length((CORBA::ULong)myPrivate->_typeList[ind].members.size()); std::vector< std::pair >::const_iterator miter; miter=myPrivate->_typeList[ind].members.begin(); @@ -454,7 +454,7 @@ SALOME_ModuleCatalogImpl::GetComponentList() SALOME_ModuleCatalog::ListOfComponents_var _list_components = new SALOME_ModuleCatalog::ListOfComponents; - _list_components->length(static_cast(myPrivate->_personal_module_list.size())); + _list_components->length((CORBA::ULong)myPrivate->_personal_module_list.size()); // All the components defined in the personal catalog are taken for(unsigned int ind=0; ind < myPrivate->_personal_module_list.size();ind++){ @@ -462,7 +462,7 @@ SALOME_ModuleCatalogImpl::GetComponentList() if(MYDEBUG) SCRUTE(_list_components[ind]) ; } - size_t indice = static_cast(myPrivate->_personal_module_list.size()) ; + size_t indice = myPrivate->_personal_module_list.size(); bool _find = false; // The components in the general catalog are taken only if they're @@ -478,10 +478,10 @@ SALOME_ModuleCatalogImpl::GetComponentList() if(!_find){ if(MYDEBUG) MESSAGE("A new component " << myPrivate->_general_module_list[ind].name << " has to be to added in the list"); - _list_components->length(static_cast(indice+1)); + _list_components->length((CORBA::ULong)indice+1); // The component is not already defined => has to be taken - _list_components[static_cast(indice)]=(myPrivate->_general_module_list[ind].name).c_str(); - if(MYDEBUG) SCRUTE(_list_components[indice]) ; + _list_components[(CORBA::ULong)indice]=(myPrivate->_general_module_list[ind].name).c_str(); + if(MYDEBUG) SCRUTE(_list_components[(CORBA::ULong)indice]) ; indice++; }else{ @@ -510,7 +510,7 @@ SALOME_ModuleCatalogImpl::GetComponentIconeList() SALOME_ModuleCatalog::ListOfIAPP_Affich_var _list_components_icone = new SALOME_ModuleCatalog::ListOfIAPP_Affich; - _list_components_icone->length(static_cast(myPrivate->_personal_module_list.size())); + _list_components_icone->length((CORBA::ULong)myPrivate->_personal_module_list.size()); // All the components defined in the personal catalog are taken for(unsigned int ind=0; ind < myPrivate->_personal_module_list.size();ind++){ @@ -523,7 +523,7 @@ SALOME_ModuleCatalogImpl::GetComponentIconeList() //if(MYDEBUG) SCRUTE(_list_components_icone[ind].moduleicone); } - size_t indice = myPrivate->_personal_module_list.size() ; + size_t indice = myPrivate->_personal_module_list.size(); bool _find = false; // The components in the general catalog are taken only if they're @@ -538,15 +538,15 @@ SALOME_ModuleCatalogImpl::GetComponentIconeList() } if(!_find){ // if(MYDEBUG) MESSAGE("A new component " << _general_module_list[ind].name << " has to be to added in the list"); - _list_components_icone->length(static_cast(indice+1)); + _list_components_icone->length((CORBA::ULong)indice+1); // The component is not already defined => has to be taken - _list_components_icone[static_cast(indice)].modulename=myPrivate->_general_module_list[ind].name.c_str(); - _list_components_icone[static_cast(indice)].moduleusername=myPrivate->_general_module_list[ind].username.c_str(); - _list_components_icone[static_cast(indice)].moduleicone=myPrivate->_general_module_list[ind].icon.c_str(); - _list_components_icone[static_cast(indice)].moduleversion=myPrivate->_general_module_list[ind].version.c_str(); - _list_components_icone[static_cast(indice)].modulecomment=myPrivate->_general_module_list[ind].comment.c_str(); - //if(MYDEBUG) SCRUTE(_list_components_icone[indice].modulename) ; - //if(MYDEBUG) SCRUTE(_list_components_icone[indice].moduleicone); + _list_components_icone[(CORBA::ULong)indice].modulename=myPrivate->_general_module_list[ind].name.c_str(); + _list_components_icone[(CORBA::ULong)indice].moduleusername=myPrivate->_general_module_list[ind].username.c_str(); + _list_components_icone[(CORBA::ULong)indice].moduleicone=myPrivate->_general_module_list[ind].icon.c_str(); + _list_components_icone[(CORBA::ULong)indice].moduleversion=myPrivate->_general_module_list[ind].version.c_str(); + _list_components_icone[(CORBA::ULong)indice].modulecomment=myPrivate->_general_module_list[ind].comment.c_str(); + //if(MYDEBUG) SCRUTE(_list_components_icone[(CORBA::ULong)indice].modulename) ; + //if(MYDEBUG) SCRUTE(_list_components_icone[(CORBA::ULong)indice].moduleicone); indice++; } @@ -917,7 +917,7 @@ void SALOME_ModuleCatalogImpl::Private::duplicate C_corba.implname = CORBA::string_dup(C_parser.implementationName.c_str()); size_t _length = C_parser.interfaces.size(); - C_corba.interfaces.length(static_cast(_length)); + C_corba.interfaces.length((CORBA::ULong)_length); for (unsigned int ind = 0; ind < _length; ind++) duplicate(C_corba.interfaces[ind], C_parser.interfaces[ind]); @@ -940,7 +940,7 @@ void SALOME_ModuleCatalogImpl::Private::duplicate // if(MYDEBUG) SCRUTE(_length); // I_corba.interfaceservicelist // = new SALOME_ModuleCatalog::ListOfInterfaceService; - I_corba.interfaceservicelist.length(static_cast(_length)); + I_corba.interfaceservicelist.length((CORBA::ULong)_length); for (unsigned int ind1 = 0; ind1 < _length ; ind1 ++) duplicate(I_corba.interfaceservicelist[ind1], @@ -967,7 +967,7 @@ void SALOME_ModuleCatalogImpl::Private::duplicate // duplicate in Parameters _length = S_parser.inParameters.size(); - S_corba.ServiceinParameter.length(static_cast(_length)); + S_corba.ServiceinParameter.length((CORBA::ULong)_length); for (unsigned int ind2 = 0; ind2 < _length ; ind2 ++) duplicate(S_corba.ServiceinParameter[ind2], @@ -975,7 +975,7 @@ void SALOME_ModuleCatalogImpl::Private::duplicate // duplicate out Parameters _length = S_parser.outParameters.size(); - S_corba.ServiceoutParameter.length(static_cast(_length)); + S_corba.ServiceoutParameter.length((CORBA::ULong)_length); for (unsigned int ind2 = 0; ind2 < _length ; ind2 ++) duplicate(S_corba.ServiceoutParameter[ind2], @@ -983,7 +983,7 @@ void SALOME_ModuleCatalogImpl::Private::duplicate // duplicate in DataStreamParameters _length = S_parser.inDataStreamParameters.size(); - S_corba.ServiceinDataStreamParameter.length(static_cast(_length)); + S_corba.ServiceinDataStreamParameter.length((CORBA::ULong)_length); for (unsigned int ind2 = 0; ind2 < _length ; ind2 ++) duplicate(S_corba.ServiceinDataStreamParameter[ind2], @@ -992,7 +992,7 @@ void SALOME_ModuleCatalogImpl::Private::duplicate // duplicate out DataStreamParameters _length = S_parser.outDataStreamParameters.size(); // if(MYDEBUG) SCRUTE(_length); - S_corba.ServiceoutDataStreamParameter.length(static_cast(_length)); + S_corba.ServiceoutDataStreamParameter.length((CORBA::ULong)_length); for (unsigned int ind2 = 0; ind2 < _length ; ind2 ++) duplicate(S_corba.ServiceoutDataStreamParameter[ind2], diff --git a/src/NamingService/SALOME_NamingService.cxx b/src/NamingService/SALOME_NamingService.cxx index 805d29d9c..9c40b1754 100644 --- a/src/NamingService/SALOME_NamingService.cxx +++ b/src/NamingService/SALOME_NamingService.cxx @@ -1494,29 +1494,29 @@ SALOME_NamingService::_createContextNameDir(std::string path, endWithDelim = true; if (endIdx == std::string::npos) endIdx = path.length(); - size_t lsub = endIdx - begIdx; + size_t lsub = endIdx - begIdx; if (lsub >= 1) splitPath.push_back(path.substr(begIdx, lsub)); begIdx = path.find_first_not_of(delims, endIdx); } - size_t dim; + int dim; if (onlyDir) // only directory part { - dim = splitPath.size()-1; // omit final object + dim = (int)splitPath.size()-1; // omit final object if (endWithDelim) // unless the path ends with a delimiter dim++; endWithDelim = true; } else - dim = splitPath.size(); // directories and final object + dim = (int)splitPath.size(); // directories and final object - context_name.length(static_cast(dim)); - for (int i=0; i<(int)dim; i++) + context_name.length((CORBA::ULong)dim); + for (int i=0; i(dim); //TODO: return or ? + return dim; //TODO: return or ? } // ============================================================================ diff --git a/src/Notification/NOTIFICATION_Consumer.cxx b/src/Notification/NOTIFICATION_Consumer.cxx index 937f7d4ad..d2e026456 100644 --- a/src/Notification/NOTIFICATION_Consumer.cxx +++ b/src/Notification/NOTIFICATION_Consumer.cxx @@ -26,7 +26,6 @@ // Module : SALOME // #include "NOTIFICATION.hxx" -#include "Basics_Utils.hxx" NOTIFICATION_Consumer::NOTIFICATION_Consumer(): proxy_supplier(0), @@ -127,6 +126,5 @@ bool NOTIFICATION_Consumer::Receive(char** graph, char** node, char** type, char void NOTIFICATION_Consumer::disconnect_structured_pull_consumer() { } -void NOTIFICATION_Consumer::offer_change(const CosN_EventTypeSeq& added, const CosN_EventTypeSeq& deled) { - SALOME_UNUSED(added); SALOME_UNUSED(deled); +void NOTIFICATION_Consumer::offer_change(const CosN_EventTypeSeq& /*added*/, const CosN_EventTypeSeq& /*deled*/) { } diff --git a/src/Notification/NOTIFICATION_Supplier.cxx b/src/Notification/NOTIFICATION_Supplier.cxx index 0025569ad..d76526c21 100644 --- a/src/Notification/NOTIFICATION_Supplier.cxx +++ b/src/Notification/NOTIFICATION_Supplier.cxx @@ -26,7 +26,6 @@ // Module : SALOME // #include "NOTIFICATION.hxx" -#include "Basics_Utils.hxx" long NOTIFICATION_Supplier::_stamp = 0; @@ -124,6 +123,5 @@ void NOTIFICATION_Supplier::Send(const char* graph, const char* node, const char void NOTIFICATION_Supplier::disconnect_structured_push_supplier() { } -void NOTIFICATION_Supplier::subscription_change(const CosN_EventTypeSeq& added, const CosN_EventTypeSeq& deled) { - SALOME_UNUSED(added); SALOME_UNUSED(deled); +void NOTIFICATION_Supplier::subscription_change(const CosN_EventTypeSeq& /*added*/, const CosN_EventTypeSeq& /*deled*/) { } diff --git a/src/Registry/RegistryConnexion.cxx b/src/Registry/RegistryConnexion.cxx index 4760d5a9b..96f940e08 100644 --- a/src/Registry/RegistryConnexion.cxx +++ b/src/Registry/RegistryConnexion.cxx @@ -116,18 +116,18 @@ void RegistryConnexion::add( const char *aName ) const Identity lesInfos( aName ) ; Registry::Infos infos ; infos.name = CORBA::string_dup( lesInfos.name() ) ; - infos.pid = lesInfos.pid() ; - infos.machine = CORBA::string_dup( lesInfos.host_char() ) ; + infos.pid = lesInfos.pid() ; + infos.machine = CORBA::string_dup( lesInfos.host_char() ) ; infos.adip = CORBA::string_dup( lesInfos.adip() ) ; - infos.uid = /*(long)*/(CORBA::Long)lesInfos.uid() ; //!< TODO: pointer truncation from const PSID to long - infos.pwname = CORBA::string_dup( lesInfos.pwname() ) ; - infos.tc_start = (CORBA::Long)lesInfos.start() ; //!< TODO: conversation from const time_t to CORBA::Long - infos.tc_hello = 0 ; - infos.tc_end = 0 ; - infos.difftime = 0 ; + infos.uid = (CORBA::Long)lesInfos.uid() ; //!< TODO: pointer truncation from const PSID to long + infos.pwname = CORBA::string_dup( lesInfos.pwname() ) ; + infos.tc_start = (CORBA::Long)lesInfos.start() ; //!< TODO: conversation from const time_t to CORBA::Long + infos.tc_hello = 0 ; + infos.tc_end = 0 ; + infos.difftime = 0 ; infos.cdir = CORBA::string_dup( lesInfos.rep() ) ; - infos.status = -1 ; - infos.ior = CORBA::string_dup(_Ior); + infos.status = -1 ; + infos.ior = CORBA::string_dup(_Ior); ASSERT(!CORBA::is_nil(this->_VarComponents)) ; diff --git a/src/Registry/RegistryService.cxx b/src/Registry/RegistryService.cxx index e673cc0a9..9bd8dc29b 100644 --- a/src/Registry/RegistryService.cxx +++ b/src/Registry/RegistryService.cxx @@ -166,8 +166,8 @@ Registry::AllInfos* RegistryService::makeseq(std::map &mymap Registry::AllInfos *all = new Registry::AllInfos ; ASSERT(all) ; - const size_t RegLength = mymap.size(); - all->length((_CORBA_ULong)RegLength); //!< TODO: conversion from size_t to _CORBA_ULong + size_t RegLength = mymap.size(); + all->length((CORBA::ULong)RegLength); std::map::iterator im; for (im=mymap.begin();im!=mymap.end(); im++) diff --git a/src/ResourcesManager/SALOME_LoadRateManager.cxx b/src/ResourcesManager/SALOME_LoadRateManager.cxx index 4d45ba5fa..898deca85 100644 --- a/src/ResourcesManager/SALOME_LoadRateManager.cxx +++ b/src/ResourcesManager/SALOME_LoadRateManager.cxx @@ -25,9 +25,8 @@ #include std::string LoadRateManagerFirst::Find(const std::vector& hosts, - const MapOfParserResourcesType& resList) + const MapOfParserResourcesType& /*resList*/) { - SALOME_UNUSED(resList); if (hosts.size() == 0) return std::string(""); @@ -65,9 +64,8 @@ std::string LoadRateManagerCycl::Find(const std::vector& hosts, } std::string LoadRateManagerAltCycl::Find(const std::vector& hosts, - const MapOfParserResourcesType& resList) + const MapOfParserResourcesType& /*resList*/) { - SALOME_UNUSED(resList); if (hosts.size() == 0) return std::string(""); diff --git a/src/ResourcesManager/SALOME_LoadRateManager.hxx b/src/ResourcesManager/SALOME_LoadRateManager.hxx index 8a7d244e2..e592f20f7 100644 --- a/src/ResourcesManager/SALOME_LoadRateManager.hxx +++ b/src/ResourcesManager/SALOME_LoadRateManager.hxx @@ -27,12 +27,11 @@ #include #include #include "SALOME_ResourcesCatalog_Parser.hxx" -#include "Basics_Utils.hxx" class RESOURCESMANAGER_EXPORT LoadRateManager { public: - virtual std::string Find(const std::vector& hosts, const MapOfParserResourcesType& resList) { SALOME_UNUSED(hosts); SALOME_UNUSED(resList); return ""; } + virtual std::string Find(const std::vector& /*hosts*/, const MapOfParserResourcesType& /*resList*/) { return ""; } }; class RESOURCESMANAGER_EXPORT LoadRateManagerFirst : public LoadRateManager diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx index 5e9309318..6562acac5 100644 --- a/src/ResourcesManager/SALOME_ResourcesManager.cxx +++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx @@ -162,11 +162,11 @@ void SALOME_ResourcesManager::ListAllAvailableResources(Engines::ResourceList_ou machines=new Engines::ResourceList; nbProcsOfMachines=new Engines::IntegerList; std::size_t sz(ret0.size()); - machines->length(static_cast(sz)); nbProcsOfMachines->length(static_cast(sz)); + machines->length((CORBA::ULong)sz); nbProcsOfMachines->length((CORBA::ULong)sz); for(std::size_t j=0;j(j)]=CORBA::string_dup(ret0[j].c_str()); - (*nbProcsOfMachines)[static_cast(j)]=ret1[j]; + (*machines)[(CORBA::ULong)j]=CORBA::string_dup(ret0[j].c_str()); + (*nbProcsOfMachines)[(CORBA::ULong)j]=ret1[j]; } } diff --git a/src/ResourcesManager/SALOME_ResourcesManager_Common.cxx b/src/ResourcesManager/SALOME_ResourcesManager_Common.cxx index 021a742b5..916b68746 100644 --- a/src/ResourcesManager/SALOME_ResourcesManager_Common.cxx +++ b/src/ResourcesManager/SALOME_ResourcesManager_Common.cxx @@ -37,7 +37,7 @@ template typename T::_var_type strvec_CPPtoCORBA(const vector & strvecCpp) { typename T::_var_type strvecCorba = new T; - strvecCorba->length((_CORBA_ULong)strvecCpp.size()); //!< TODO: conversion from size_t to _CORBA_ULong + strvecCorba->length((CORBA::ULong)strvecCpp.size()); for(unsigned int i=0;i CasCadeSeq; for (size_t i = 0; i < other.length(); i++) { - CasCadeSeq.push_back(other[(_CORBA_ULong)i]); //!< TODO: conversion from size_t to _CORBA_ULong + CasCadeSeq.push_back(other[(CORBA::ULong)i]); //!< TODO: conversion from size_t to CORBA::ULong } dynamic_cast(_impl)->Assign(CasCadeSeq); } diff --git a/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx index 0301aa08d..06d10a4ec 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx @@ -223,7 +223,7 @@ SALOMEDS::StringSeq* SALOMEDS_AttributeStudyProperties_i::GetStoredComponents() SALOMEDS::Locker lock; std::vector components = dynamic_cast(_impl)->GetStoredComponents(); SALOMEDS::StringSeq_var c_components = new SALOMEDS::StringSeq(); - c_components->length((_CORBA_ULong)components.size()); //!< TODO: conversion from size_t to _CORBA_ULong + c_components->length((CORBA::ULong)components.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)components.size(); i++) { //TODO: mismatch signed/unsigned c_components[i] = CORBA::string_dup(components[i].c_str()); } @@ -243,7 +243,7 @@ SALOMEDS::StringSeq* SALOMEDS_AttributeStudyProperties_i::GetComponentVersions(c SALOMEDS::Locker lock; std::vector versions = dynamic_cast(_impl)->GetComponentVersions(theComponent); SALOMEDS::StringSeq_var c_versions = new SALOMEDS::StringSeq(); - c_versions->length((_CORBA_ULong)versions.size()); //!< TODO: conversion from size_t to _CORBA_ULong + c_versions->length((CORBA::ULong)versions.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)versions.size(); i++) { //TODO: mismatch signed/unsigned c_versions[i] = CORBA::string_dup(versions[i].c_str()); } diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx index b4dea91ca..1e1c69c0e 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx @@ -54,7 +54,6 @@ char* SALOMEDS_AttributeTableOfInteger_i::GetTitle() } void SALOMEDS_AttributeTableOfInteger_i::SetRowTitle(CORBA::Long theIndex, const char* theTitle) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATI_IncorrectIndex); @@ -65,7 +64,6 @@ noexcept } char* SALOMEDS_AttributeTableOfInteger_i::GetRowTitle(CORBA::Long theIndex) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATI_IncorrectIndex); @@ -77,7 +75,6 @@ noexcept } void SALOMEDS_AttributeTableOfInteger_i::SetRowTitles(const SALOMEDS::StringSeq& theTitles) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATI_IncorrectArgumentLength); @@ -101,7 +98,6 @@ SALOMEDS::StringSeq* SALOMEDS_AttributeTableOfInteger_i::GetRowTitles() } void SALOMEDS_AttributeTableOfInteger_i::SetColumnTitle(CORBA::Long theIndex, const char* theTitle) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATI_IncorrectIndex); @@ -113,7 +109,6 @@ noexcept } char* SALOMEDS_AttributeTableOfInteger_i::GetColumnTitle(CORBA::Long theIndex) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATI_IncorrectIndex); @@ -125,7 +120,6 @@ noexcept } void SALOMEDS_AttributeTableOfInteger_i::SetColumnTitles(const SALOMEDS::StringSeq& theTitles) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectArgumentLength); @@ -150,7 +144,6 @@ SALOMEDS::StringSeq* SALOMEDS_AttributeTableOfInteger_i::GetColumnTitles() //Units support void SALOMEDS_AttributeTableOfInteger_i::SetRowUnit(CORBA::Long theIndex, const char* theUnit) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATI_IncorrectIndex); @@ -161,7 +154,6 @@ noexcept } char* SALOMEDS_AttributeTableOfInteger_i::GetRowUnit(CORBA::Long theIndex) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATI_IncorrectIndex); @@ -173,7 +165,6 @@ noexcept } void SALOMEDS_AttributeTableOfInteger_i::SetRowUnits(const SALOMEDS::StringSeq& theUnits) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATI_IncorrectArgumentLength); @@ -209,7 +200,6 @@ CORBA::Long SALOMEDS_AttributeTableOfInteger_i::GetNbColumns() } void SALOMEDS_AttributeTableOfInteger_i::AddRow(const SALOMEDS::LongSeq& theData) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectArgumentLength); @@ -217,7 +207,7 @@ noexcept SALOMEDSImpl_AttributeTableOfInteger* aTable = dynamic_cast(_impl); std::vector aRow; - for (size_t i = 0; i < theData.length(); i++) aRow.push_back(theData[(_CORBA_ULong)i]); //!< TODO: conversion from size_t to _CORBA_ULong + for (size_t i = 0; i < theData.length(); i++) aRow.push_back(theData[(CORBA::ULong)i]); //!< TODO: conversion from size_t to CORBA::ULong try { aTable->SetRowData(aTable->GetNbRows() + 1, aRow); } @@ -227,7 +217,6 @@ noexcept } void SALOMEDS_AttributeTableOfInteger_i::SetRow(CORBA::Long theRow, const SALOMEDS::LongSeq& theData) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectArgumentLength); @@ -235,7 +224,7 @@ noexcept SALOMEDSImpl_AttributeTableOfInteger* aTable = dynamic_cast(_impl); std::vector aRow; - for (size_t i = 0; i < theData.length(); i++) aRow.push_back(theData[(_CORBA_ULong)i]); //!< TODO: conversion from size_t to _CORBA_ULong + for (size_t i = 0; i < theData.length(); i++) aRow.push_back(theData[(CORBA::ULong)i]); //!< TODO: conversion from size_t to CORBA::ULong try { aTable->SetRowData(theRow, aRow); } @@ -245,7 +234,6 @@ noexcept } SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::GetRow(CORBA::Long theRow) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectIndex); @@ -254,7 +242,7 @@ noexcept SALOMEDS::LongSeq_var CorbaSeq = new SALOMEDS::LongSeq; std::vector aRow = aTable->GetRowData(theRow); - CorbaSeq->length((_CORBA_ULong)aRow.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aRow.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < aRow.size(); i++) { CorbaSeq[i] = aRow[i]; } @@ -262,7 +250,6 @@ noexcept } void SALOMEDS_AttributeTableOfInteger_i::AddColumn(const SALOMEDS::LongSeq& theData) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectArgumentLength); @@ -270,7 +257,7 @@ noexcept SALOMEDSImpl_AttributeTableOfInteger* aTable = dynamic_cast(_impl); std::vector aColumn; - for (size_t i = 0; i < theData.length(); i++) aColumn.push_back(theData[(_CORBA_ULong)i]); //!< TODO: conversion from size_t to _CORBA_ULong + for (size_t i = 0; i < theData.length(); i++) aColumn.push_back(theData[(CORBA::ULong)i]); //!< TODO: conversion from size_t to CORBA::ULong try { aTable->SetColumnData(aTable->GetNbColumns() + 1, aColumn); } @@ -280,7 +267,6 @@ noexcept } void SALOMEDS_AttributeTableOfInteger_i::SetColumn(CORBA::Long theColumn, const SALOMEDS::LongSeq& theData) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectArgumentLength); @@ -288,7 +274,7 @@ noexcept SALOMEDSImpl_AttributeTableOfInteger* aTable = dynamic_cast(_impl); std::vector aColumn; - for (size_t i = 0; i < theData.length(); i++) aColumn.push_back(theData[(_CORBA_ULong)i]); //!< TODO: conversion from size_t to _CORBA_ULong + for (size_t i = 0; i < theData.length(); i++) aColumn.push_back(theData[(CORBA::ULong)i]); //!< TODO: conversion from size_t to CORBA::ULong try { aTable->SetColumnData(theColumn, aColumn); } @@ -298,7 +284,6 @@ noexcept } SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::GetColumn(CORBA::Long theColumn) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectIndex); @@ -307,7 +292,7 @@ noexcept SALOMEDS::LongSeq_var CorbaSeq = new SALOMEDS::LongSeq; std::vector aColumn = aTable->GetColumnData(theColumn); - CorbaSeq->length((_CORBA_ULong)aColumn.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aColumn.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < aColumn.size(); i++) { CorbaSeq[i] = aColumn[i]; } @@ -315,7 +300,6 @@ noexcept } void SALOMEDS_AttributeTableOfInteger_i::PutValue(CORBA::Long theValue, CORBA::Long theRow, CORBA::Long theColumn) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectIndex); @@ -337,7 +321,6 @@ CORBA::Boolean SALOMEDS_AttributeTableOfInteger_i::HasValue(CORBA::Long theRow, } CORBA::Long SALOMEDS_AttributeTableOfInteger_i::GetValue(CORBA::Long theRow, CORBA::Long theColumn) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectIndex); @@ -356,7 +339,6 @@ noexcept } void SALOMEDS_AttributeTableOfInteger_i::RemoveValue(CORBA::Long theRow, CORBA::Long theColumn) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectIndex); @@ -381,7 +363,7 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::GetRowSetIndices(CORBA::L SALOMEDS::LongSeq_var CorbaSeq = new SALOMEDS::LongSeq; std::vector aSeq = aTable->GetSetRowIndices(theRow); - CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aSeq.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = aSeq[i]; } @@ -425,7 +407,6 @@ SALOMEDS::TMPFile* SALOMEDS_AttributeTableOfInteger_i::SaveToFile() SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::SortRow(CORBA::Long theRow, SALOMEDS::AttributeTable::SortOrder sortOrder, SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectIndex); @@ -442,7 +423,7 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::SortRow(CORBA::Long theRo catch(...) { throw SALOMEDS::AttributeTable::IncorrectIndex(); } - CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aSeq.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = aSeq[i]; } @@ -452,7 +433,6 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::SortRow(CORBA::Long theRo SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::SortColumn(CORBA::Long theColumn, SALOMEDS::AttributeTable::SortOrder sortOrder, SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectIndex); @@ -469,7 +449,7 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::SortColumn(CORBA::Long th catch(...) { throw SALOMEDS::AttributeTable::IncorrectIndex(); } - CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aSeq.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = aSeq[i]; } @@ -479,7 +459,6 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::SortColumn(CORBA::Long th SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::SortByRow(CORBA::Long theRow, SALOMEDS::AttributeTable::SortOrder sortOrder, SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectIndex); @@ -496,7 +475,7 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::SortByRow(CORBA::Long the catch(...) { throw SALOMEDS::AttributeTable::IncorrectIndex(); } - CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aSeq.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = aSeq[i]; } @@ -506,7 +485,6 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::SortByRow(CORBA::Long the SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::SortByColumn(CORBA::Long theColumn, SALOMEDS::AttributeTable::SortOrder sortOrder, SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectIndex); @@ -523,7 +501,7 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::SortByColumn(CORBA::Long catch(...) { throw SALOMEDS::AttributeTable::IncorrectIndex(); } - CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aSeq.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = aSeq[i]; } @@ -532,7 +510,6 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfInteger_i::SortByColumn(CORBA::Long void SALOMEDS_AttributeTableOfInteger_i::SwapCells(CORBA::Long theRow1, CORBA::Long theColumn1, CORBA::Long theRow2, CORBA::Long theColumn2) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectIndex); @@ -552,7 +529,6 @@ void SALOMEDS_AttributeTableOfInteger_i::SwapCells(CORBA::Long theRow1, CORBA::L } void SALOMEDS_AttributeTableOfInteger_i::SwapRows(CORBA::Long theRow1, CORBA::Long theRow2) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectIndex); @@ -570,7 +546,6 @@ noexcept } void SALOMEDS_AttributeTableOfInteger_i::SwapColumns(CORBA::Long theColumn1, CORBA::Long theColumn2) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATI_IncorrectIndex); diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.hxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.hxx index cb95bdbce..bf0fb2f99 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.hxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.hxx @@ -45,74 +45,49 @@ public: virtual void SetTitle(const char* theTitle); virtual char* GetTitle(); - virtual void SetRowTitle(CORBA::Long theIndex, const char* theTitle) - noexcept; - virtual char* GetRowTitle(CORBA::Long theIndex) - noexcept; - virtual void SetRowTitles(const SALOMEDS::StringSeq& theTitles) - noexcept; + virtual void SetRowTitle(CORBA::Long theIndex, const char* theTitle); + virtual char* GetRowTitle(CORBA::Long theIndex); + virtual void SetRowTitles(const SALOMEDS::StringSeq& theTitles); virtual SALOMEDS::StringSeq* GetRowTitles(); - virtual void SetColumnTitle(CORBA::Long theIndex, const char* theTitle) - noexcept; - virtual char* GetColumnTitle(CORBA::Long theIndex) - noexcept; - virtual void SetColumnTitles(const SALOMEDS::StringSeq& theTitles) - noexcept; + virtual void SetColumnTitle(CORBA::Long theIndex, const char* theTitle); + virtual char* GetColumnTitle(CORBA::Long theIndex); + virtual void SetColumnTitles(const SALOMEDS::StringSeq& theTitles); virtual SALOMEDS::StringSeq* GetColumnTitles(); - virtual void SetRowUnit(CORBA::Long theIndex, const char* theUnit) - noexcept; - virtual char* GetRowUnit(CORBA::Long theIndex) - noexcept; - virtual void SetRowUnits(const SALOMEDS::StringSeq& theUnits) - noexcept; + virtual void SetRowUnit(CORBA::Long theIndex, const char* theUnit); + virtual char* GetRowUnit(CORBA::Long theIndex); + virtual void SetRowUnits(const SALOMEDS::StringSeq& theUnits); virtual SALOMEDS::StringSeq* GetRowUnits(); virtual CORBA::Long GetNbRows(); virtual CORBA::Long GetNbColumns(); - virtual void AddRow(const SALOMEDS::LongSeq& theData) - noexcept; - virtual void SetRow(CORBA::Long theRow, const SALOMEDS::LongSeq& theData) - noexcept; - virtual SALOMEDS::LongSeq* GetRow(CORBA::Long theRow) - noexcept; - virtual void AddColumn(const SALOMEDS::LongSeq& theData) - noexcept; - virtual void SetColumn(CORBA::Long theColumn, const SALOMEDS::LongSeq& theData) - noexcept; - virtual SALOMEDS::LongSeq* GetColumn(CORBA::Long theColumn) - noexcept; - virtual void PutValue(CORBA::Long theValue, CORBA::Long theRow, CORBA::Long theColumn) - noexcept; + virtual void AddRow(const SALOMEDS::LongSeq& theData); + virtual void SetRow(CORBA::Long theRow, const SALOMEDS::LongSeq& theData); + virtual SALOMEDS::LongSeq* GetRow(CORBA::Long theRow); + virtual void AddColumn(const SALOMEDS::LongSeq& theData); + virtual void SetColumn(CORBA::Long theColumn, const SALOMEDS::LongSeq& theData); + virtual SALOMEDS::LongSeq* GetColumn(CORBA::Long theColumn); + virtual void PutValue(CORBA::Long theValue, CORBA::Long theRow, CORBA::Long theColumn); virtual CORBA::Boolean HasValue(CORBA::Long theRow, CORBA::Long theColumn); - virtual CORBA::Long GetValue(CORBA::Long theRow, CORBA::Long theColumn) - noexcept; - virtual void RemoveValue(CORBA::Long theRow, CORBA::Long theColumn) - noexcept; + virtual CORBA::Long GetValue(CORBA::Long theRow, CORBA::Long theColumn); + virtual void RemoveValue(CORBA::Long theRow, CORBA::Long theColumn); virtual SALOMEDS::LongSeq* GetRowSetIndices(CORBA::Long theRow); virtual void SetNbColumns(CORBA::Long theNbColumns); virtual SALOMEDS::LongSeq* SortRow(CORBA::Long theRow, SALOMEDS::AttributeTable::SortOrder sortOrder, - SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept; + SALOMEDS::AttributeTable::SortPolicy sortPolicy); virtual SALOMEDS::LongSeq* SortColumn(CORBA::Long theColumn, SALOMEDS::AttributeTable::SortOrder sortOrder, - SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept; + SALOMEDS::AttributeTable::SortPolicy sortPolicy); virtual SALOMEDS::LongSeq* SortByRow(CORBA::Long theRow, SALOMEDS::AttributeTable::SortOrder sortOrder, - SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept; + SALOMEDS::AttributeTable::SortPolicy sortPolicy); virtual SALOMEDS::LongSeq* SortByColumn(CORBA::Long theColumn, SALOMEDS::AttributeTable::SortOrder sortOrder, - SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept; + SALOMEDS::AttributeTable::SortPolicy sortPolicy); virtual void SwapCells(CORBA::Long theRow1, CORBA::Long theColumn1, - CORBA::Long theRow2, CORBA::Long theColumn2) - noexcept; - virtual void SwapRows(CORBA::Long theRow1, CORBA::Long theRow2) - noexcept; - virtual void SwapColumns(CORBA::Long theColumn1, CORBA::Long theColumn2) - noexcept; + CORBA::Long theRow2, CORBA::Long theColumn2); + virtual void SwapRows(CORBA::Long theRow1, CORBA::Long theRow2); + virtual void SwapColumns(CORBA::Long theColumn1, CORBA::Long theColumn2); virtual bool ReadFromFile(const SALOMEDS::TMPFile& theStream); virtual SALOMEDS::TMPFile* SaveToFile(); diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx index 5e427b5fb..10ed9bf65 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx @@ -53,7 +53,6 @@ char* SALOMEDS_AttributeTableOfReal_i::GetTitle() } void SALOMEDS_AttributeTableOfReal_i::SetRowTitle(CORBA::Long theIndex, const char* theTitle) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATR_IncorrectIndex); @@ -64,7 +63,6 @@ noexcept } char* SALOMEDS_AttributeTableOfReal_i::GetRowTitle(CORBA::Long theIndex) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATR_IncorrectIndex); @@ -76,7 +74,6 @@ noexcept } void SALOMEDS_AttributeTableOfReal_i::SetRowTitles(const SALOMEDS::StringSeq& theTitles) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATR_IncorrectArgumentLength); @@ -100,7 +97,6 @@ SALOMEDS::StringSeq* SALOMEDS_AttributeTableOfReal_i::GetRowTitles() } void SALOMEDS_AttributeTableOfReal_i::SetColumnTitle(CORBA::Long theIndex, const char* theTitle) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATR_IncorrectIndex); @@ -112,7 +108,6 @@ noexcept } char* SALOMEDS_AttributeTableOfReal_i::GetColumnTitle(CORBA::Long theIndex) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATR_IncorrectIndex); @@ -124,7 +119,6 @@ noexcept } void SALOMEDS_AttributeTableOfReal_i::SetColumnTitles(const SALOMEDS::StringSeq& theTitles) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectArgumentLength); @@ -149,7 +143,6 @@ SALOMEDS::StringSeq* SALOMEDS_AttributeTableOfReal_i::GetColumnTitles() //Units support void SALOMEDS_AttributeTableOfReal_i::SetRowUnit(CORBA::Long theIndex, const char* theUnit) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATR_IncorrectIndex); @@ -160,7 +153,6 @@ noexcept } char* SALOMEDS_AttributeTableOfReal_i::GetRowUnit(CORBA::Long theIndex) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATR_IncorrectIndex); @@ -172,7 +164,6 @@ noexcept } void SALOMEDS_AttributeTableOfReal_i::SetRowUnits(const SALOMEDS::StringSeq& theUnits) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATR_IncorrectArgumentLength); @@ -209,7 +200,6 @@ CORBA::Long SALOMEDS_AttributeTableOfReal_i::GetNbColumns() } void SALOMEDS_AttributeTableOfReal_i::AddRow(const SALOMEDS::DoubleSeq& theData) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectArgumentLength); @@ -217,12 +207,11 @@ noexcept SALOMEDSImpl_AttributeTableOfReal* aTable = dynamic_cast(_impl); std::vector aRow; - for (size_t i = 0; i < theData.length(); i++) aRow.push_back(theData[(_CORBA_ULong)i]); //!< TODO: conversion from size_t to _CORBA_ULong + for (size_t i = 0; i < theData.length(); i++) aRow.push_back(theData[(CORBA::ULong)i]); //!< TODO: conversion from size_t to CORBA::ULong aTable->SetRowData(aTable->GetNbRows() + 1, aRow); } void SALOMEDS_AttributeTableOfReal_i::SetRow(CORBA::Long theRow, const SALOMEDS::DoubleSeq& theData) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectArgumentLength); @@ -230,12 +219,11 @@ noexcept SALOMEDSImpl_AttributeTableOfReal* aTable = dynamic_cast(_impl); std::vector aRow; - for (size_t i = 0; i < theData.length(); i++) aRow.push_back(theData[(_CORBA_ULong)i]); //!< TODO: conversion from size_t to _CORBA_ULong + for (size_t i = 0; i < theData.length(); i++) aRow.push_back(theData[(CORBA::ULong)i]); //!< TODO: conversion from size_t to CORBA::ULong aTable->SetRowData(theRow, aRow); } SALOMEDS::DoubleSeq* SALOMEDS_AttributeTableOfReal_i::GetRow(CORBA::Long theRow) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectIndex); @@ -244,7 +232,7 @@ noexcept SALOMEDS::DoubleSeq_var CorbaSeq = new SALOMEDS::DoubleSeq; std::vector aRow = aTable->GetRowData(theRow); - CorbaSeq->length((_CORBA_ULong)aRow.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aRow.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < aRow.size(); i++) { CorbaSeq[i] = aRow[i]; } @@ -252,7 +240,6 @@ noexcept } void SALOMEDS_AttributeTableOfReal_i::AddColumn(const SALOMEDS::DoubleSeq& theData) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectArgumentLength); @@ -260,12 +247,11 @@ noexcept SALOMEDSImpl_AttributeTableOfReal* aTable = dynamic_cast(_impl); std::vector aColumn; - for (size_t i = 0; i < theData.length(); i++) aColumn.push_back(theData[(_CORBA_ULong)i]); //!< TODO: conversion from size_t to _CORBA_ULong + for (size_t i = 0; i < theData.length(); i++) aColumn.push_back(theData[(CORBA::ULong)i]); //!< TODO: conversion from size_t to CORBA::ULong aTable->SetColumnData(aTable->GetNbColumns() + 1, aColumn); } void SALOMEDS_AttributeTableOfReal_i::SetColumn(CORBA::Long theColumn, const SALOMEDS::DoubleSeq& theData) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectArgumentLength); @@ -273,12 +259,11 @@ noexcept SALOMEDSImpl_AttributeTableOfReal* aTable = dynamic_cast(_impl); std::vector aColumn; - for (size_t i = 0; i < theData.length(); i++) aColumn.push_back(theData[(_CORBA_ULong)i]); //!< TODO: conversion from size_t to _CORBA_ULong + for (size_t i = 0; i < theData.length(); i++) aColumn.push_back(theData[(CORBA::ULong)i]); //!< TODO: conversion from size_t to CORBA::ULong aTable->SetColumnData(theColumn, aColumn); } SALOMEDS::DoubleSeq* SALOMEDS_AttributeTableOfReal_i::GetColumn(CORBA::Long theColumn) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectIndex); @@ -287,7 +272,7 @@ noexcept SALOMEDS::DoubleSeq_var CorbaSeq = new SALOMEDS::DoubleSeq; std::vector aColumn = aTable->GetColumnData(theColumn); - CorbaSeq->length((_CORBA_ULong)aColumn.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aColumn.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < aColumn.size(); i++) { CorbaSeq[i] = aColumn[i]; } @@ -295,7 +280,6 @@ noexcept } void SALOMEDS_AttributeTableOfReal_i::PutValue(CORBA::Double theValue, CORBA::Long theRow, CORBA::Long theColumn) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectIndex); @@ -312,7 +296,6 @@ CORBA::Boolean SALOMEDS_AttributeTableOfReal_i::HasValue(CORBA::Long theRow, COR } CORBA::Double SALOMEDS_AttributeTableOfReal_i::GetValue(CORBA::Long theRow, CORBA::Long theColumn) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectIndex); @@ -332,7 +315,6 @@ noexcept } void SALOMEDS_AttributeTableOfReal_i::RemoveValue(CORBA::Long theRow, CORBA::Long theColumn) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectIndex); @@ -401,7 +383,6 @@ SALOMEDS::TMPFile* SALOMEDS_AttributeTableOfReal_i::SaveToFile() SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfReal_i::SortRow(CORBA::Long theRow, SALOMEDS::AttributeTable::SortOrder sortOrder, SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectIndex); @@ -418,7 +399,7 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfReal_i::SortRow(CORBA::Long theRow, catch(...) { throw SALOMEDS::AttributeTable::IncorrectIndex(); } - CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aSeq.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = aSeq[i]; } @@ -428,7 +409,6 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfReal_i::SortRow(CORBA::Long theRow, SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfReal_i::SortColumn(CORBA::Long theColumn, SALOMEDS::AttributeTable::SortOrder sortOrder, SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectIndex); @@ -445,7 +425,7 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfReal_i::SortColumn(CORBA::Long theCo catch(...) { throw SALOMEDS::AttributeTable::IncorrectIndex(); } - CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aSeq.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = aSeq[i]; } @@ -455,7 +435,6 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfReal_i::SortColumn(CORBA::Long theCo SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfReal_i::SortByRow(CORBA::Long theRow, SALOMEDS::AttributeTable::SortOrder sortOrder, SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectIndex); @@ -472,7 +451,7 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfReal_i::SortByRow(CORBA::Long theRow catch(...) { throw SALOMEDS::AttributeTable::IncorrectIndex(); } - CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aSeq.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = aSeq[i]; } @@ -482,7 +461,6 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfReal_i::SortByRow(CORBA::Long theRow SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfReal_i::SortByColumn(CORBA::Long theColumn, SALOMEDS::AttributeTable::SortOrder sortOrder, SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectIndex); @@ -499,7 +477,7 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfReal_i::SortByColumn(CORBA::Long the catch(...) { throw SALOMEDS::AttributeTable::IncorrectIndex(); } - CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aSeq.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = aSeq[i]; } @@ -508,7 +486,6 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfReal_i::SortByColumn(CORBA::Long the void SALOMEDS_AttributeTableOfReal_i::SwapCells(CORBA::Long theRow1, CORBA::Long theColumn1, CORBA::Long theRow2, CORBA::Long theColumn2) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectIndex); @@ -528,7 +505,6 @@ void SALOMEDS_AttributeTableOfReal_i::SwapCells(CORBA::Long theRow1, CORBA::Long } void SALOMEDS_AttributeTableOfReal_i::SwapRows(CORBA::Long theRow1, CORBA::Long theRow2) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectIndex); @@ -546,7 +522,6 @@ noexcept } void SALOMEDS_AttributeTableOfReal_i::SwapColumns(CORBA::Long theColumn1, CORBA::Long theColumn2) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATR_IncorrectIndex); diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.hxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.hxx index fc037afb2..1208617c8 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.hxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.hxx @@ -45,74 +45,49 @@ public: virtual void SetTitle(const char* theTitle); virtual char* GetTitle(); - virtual void SetRowTitle(CORBA::Long theIndex, const char* theTitle) - noexcept; - virtual char* GetRowTitle(CORBA::Long theIndex) - noexcept; - virtual void SetRowTitles(const SALOMEDS::StringSeq& theTitles) - noexcept; + virtual void SetRowTitle(CORBA::Long theIndex, const char* theTitle); + virtual char* GetRowTitle(CORBA::Long theIndex); + virtual void SetRowTitles(const SALOMEDS::StringSeq& theTitles); virtual SALOMEDS::StringSeq* GetRowTitles(); - virtual void SetColumnTitle(CORBA::Long theIndex, const char* theTitle) - noexcept; - virtual char* GetColumnTitle(CORBA::Long theIndex) - noexcept; - virtual void SetColumnTitles(const SALOMEDS::StringSeq& theTitles) - noexcept; + virtual void SetColumnTitle(CORBA::Long theIndex, const char* theTitle); + virtual char* GetColumnTitle(CORBA::Long theIndex); + virtual void SetColumnTitles(const SALOMEDS::StringSeq& theTitles); virtual SALOMEDS::StringSeq* GetColumnTitles(); - virtual void SetRowUnit(CORBA::Long theIndex, const char* theUnit) - noexcept; - virtual char* GetRowUnit(CORBA::Long theIndex) - noexcept; - virtual void SetRowUnits(const SALOMEDS::StringSeq& theUnits) - noexcept; + virtual void SetRowUnit(CORBA::Long theIndex, const char* theUnit); + virtual char* GetRowUnit(CORBA::Long theIndex); + virtual void SetRowUnits(const SALOMEDS::StringSeq& theUnits); virtual SALOMEDS::StringSeq* GetRowUnits(); virtual CORBA::Long GetNbRows(); virtual CORBA::Long GetNbColumns(); - virtual void AddRow(const SALOMEDS::DoubleSeq& theData) - noexcept; - virtual void SetRow(CORBA::Long theRow, const SALOMEDS::DoubleSeq& theData) - noexcept; - virtual SALOMEDS::DoubleSeq* GetRow(CORBA::Long theRow) - noexcept; - virtual void AddColumn(const SALOMEDS::DoubleSeq& theData) - noexcept; - virtual void SetColumn(CORBA::Long theColumn, const SALOMEDS::DoubleSeq& theData) - noexcept; - virtual SALOMEDS::DoubleSeq* GetColumn(CORBA::Long theColumn) - noexcept; - virtual void PutValue(CORBA::Double theValue, CORBA::Long theRow, CORBA::Long theColumn) - noexcept; + virtual void AddRow(const SALOMEDS::DoubleSeq& theData); + virtual void SetRow(CORBA::Long theRow, const SALOMEDS::DoubleSeq& theData); + virtual SALOMEDS::DoubleSeq* GetRow(CORBA::Long theRow); + virtual void AddColumn(const SALOMEDS::DoubleSeq& theData); + virtual void SetColumn(CORBA::Long theColumn, const SALOMEDS::DoubleSeq& theData); + virtual SALOMEDS::DoubleSeq* GetColumn(CORBA::Long theColumn); + virtual void PutValue(CORBA::Double theValue, CORBA::Long theRow, CORBA::Long theColumn); virtual CORBA::Boolean HasValue(CORBA::Long theRow, CORBA::Long theColumn); - virtual CORBA::Double GetValue(CORBA::Long theRow, CORBA::Long theColumn) - noexcept; - virtual void RemoveValue(CORBA::Long theRow, CORBA::Long theColumn) - noexcept; + virtual CORBA::Double GetValue(CORBA::Long theRow, CORBA::Long theColumn); + virtual void RemoveValue(CORBA::Long theRow, CORBA::Long theColumn); virtual SALOMEDS::LongSeq* GetRowSetIndices(CORBA::Long theRow); virtual void SetNbColumns(CORBA::Long theNbColumns); virtual SALOMEDS::LongSeq* SortRow(CORBA::Long theRow, SALOMEDS::AttributeTable::SortOrder sortOrder, - SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept; + SALOMEDS::AttributeTable::SortPolicy sortPolicy); virtual SALOMEDS::LongSeq* SortColumn(CORBA::Long theColumn, SALOMEDS::AttributeTable::SortOrder sortOrder, - SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept; + SALOMEDS::AttributeTable::SortPolicy sortPolicy); virtual SALOMEDS::LongSeq* SortByRow(CORBA::Long theRow, SALOMEDS::AttributeTable::SortOrder sortOrder, - SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept; + SALOMEDS::AttributeTable::SortPolicy sortPolicy); virtual SALOMEDS::LongSeq* SortByColumn(CORBA::Long theColumn, SALOMEDS::AttributeTable::SortOrder sortOrder, - SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept; + SALOMEDS::AttributeTable::SortPolicy sortPolicy); virtual void SwapCells(CORBA::Long theRow1, CORBA::Long theColumn1, - CORBA::Long theRow2, CORBA::Long theColumn2) - noexcept; - virtual void SwapRows(CORBA::Long theRow1, CORBA::Long theRow2) - noexcept; - virtual void SwapColumns(CORBA::Long theColumn1, CORBA::Long theColumn2) - noexcept; + CORBA::Long theRow2, CORBA::Long theColumn2); + virtual void SwapRows(CORBA::Long theRow1, CORBA::Long theRow2); + virtual void SwapColumns(CORBA::Long theColumn1, CORBA::Long theColumn2); virtual bool ReadFromFile(const SALOMEDS::TMPFile& theStream); virtual SALOMEDS::TMPFile* SaveToFile(); diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx index 4f3427f6a..8b3748d6e 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx @@ -54,7 +54,6 @@ char* SALOMEDS_AttributeTableOfString_i::GetTitle() } void SALOMEDS_AttributeTableOfString_i::SetRowTitle(CORBA::Long theIndex, const char* theTitle) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); @@ -66,7 +65,6 @@ noexcept } char* SALOMEDS_AttributeTableOfString_i::GetRowTitle(CORBA::Long theIndex) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATS_IncorrectIndex); @@ -78,7 +76,6 @@ noexcept } void SALOMEDS_AttributeTableOfString_i::SetRowTitles(const SALOMEDS::StringSeq& theTitles) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectArgumentLength); @@ -102,7 +99,6 @@ SALOMEDS::StringSeq* SALOMEDS_AttributeTableOfString_i::GetRowTitles() } void SALOMEDS_AttributeTableOfString_i::SetColumnTitle(CORBA::Long theIndex, const char* theTitle) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); @@ -113,7 +109,6 @@ noexcept } char* SALOMEDS_AttributeTableOfString_i::GetColumnTitle(CORBA::Long theIndex) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATS_IncorrectIndex); @@ -125,7 +120,6 @@ noexcept } void SALOMEDS_AttributeTableOfString_i::SetColumnTitles(const SALOMEDS::StringSeq& theTitles) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectArgumentLength); @@ -150,7 +144,6 @@ SALOMEDS::StringSeq* SALOMEDS_AttributeTableOfString_i::GetColumnTitles() //Units support void SALOMEDS_AttributeTableOfString_i::SetRowUnit(CORBA::Long theIndex, const char* theUnit) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); @@ -161,7 +154,6 @@ noexcept } char* SALOMEDS_AttributeTableOfString_i::GetRowUnit(CORBA::Long theIndex) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch (ATS_IncorrectIndex); @@ -173,7 +165,6 @@ noexcept } void SALOMEDS_AttributeTableOfString_i::SetRowUnits(const SALOMEDS::StringSeq& theUnits) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectArgumentLength); @@ -210,7 +201,6 @@ CORBA::Long SALOMEDS_AttributeTableOfString_i::GetNbColumns() } void SALOMEDS_AttributeTableOfString_i::AddRow(const SALOMEDS::StringSeq& theData) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectArgumentLength); @@ -218,12 +208,11 @@ noexcept SALOMEDSImpl_AttributeTableOfString* aTable = dynamic_cast(_impl); std::vector aRow; - for (size_t i = 0; i < theData.length(); i++) aRow.push_back(std::string(CORBA::string_dup(theData[(_CORBA_ULong)i]))); //!< TODO: conversion from size_t to _CORBA_ULong + for (size_t i = 0; i < theData.length(); i++) aRow.push_back(std::string(CORBA::string_dup(theData[(CORBA::ULong)i]))); //!< TODO: conversion from size_t to CORBA::ULong aTable->SetRowData(aTable->GetNbRows() + 1, aRow); } void SALOMEDS_AttributeTableOfString_i::SetRow(CORBA::Long theRow, const SALOMEDS::StringSeq& theData) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectArgumentLength); @@ -231,12 +220,11 @@ noexcept SALOMEDSImpl_AttributeTableOfString* aTable = dynamic_cast(_impl); std::vector aRow; - for (size_t i = 0; i < theData.length(); i++) aRow.push_back(std::string(CORBA::string_dup(theData[(_CORBA_ULong)i].in()))); //!< TODO: conversion from size_t to _CORBA_ULong + for (size_t i = 0; i < theData.length(); i++) aRow.push_back(std::string(CORBA::string_dup(theData[(CORBA::ULong)i].in()))); //!< TODO: conversion from size_t to CORBA::ULong aTable->SetRowData(theRow, aRow); } SALOMEDS::StringSeq* SALOMEDS_AttributeTableOfString_i::GetRow(CORBA::Long theRow) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); @@ -245,7 +233,7 @@ noexcept SALOMEDS::StringSeq_var CorbaSeq = new SALOMEDS::StringSeq; std::vector aRow = aTable->GetRowData(theRow); - CorbaSeq->length((_CORBA_ULong)aRow.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aRow.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aRow.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = CORBA::string_dup(aRow[i].c_str()); } @@ -253,7 +241,6 @@ noexcept } void SALOMEDS_AttributeTableOfString_i::AddColumn(const SALOMEDS::StringSeq& theData) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectArgumentLength); @@ -261,12 +248,11 @@ noexcept SALOMEDSImpl_AttributeTableOfString* aTable = dynamic_cast(_impl); std::vector aColumn; - for (size_t i = 0; i < theData.length(); i++) aColumn.push_back(std::string(CORBA::string_dup(theData[(_CORBA_ULong)i]))); //!< TODO: conversion from size_t to _CORBA_ULong + for (size_t i = 0; i < theData.length(); i++) aColumn.push_back(std::string(CORBA::string_dup(theData[(CORBA::ULong)i]))); //!< TODO: conversion from size_t to CORBA::ULong aTable->SetColumnData(aTable->GetNbColumns() + 1, aColumn); } void SALOMEDS_AttributeTableOfString_i::SetColumn(CORBA::Long theColumn, const SALOMEDS::StringSeq& theData) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectArgumentLength); @@ -274,12 +260,11 @@ noexcept SALOMEDSImpl_AttributeTableOfString* aTable = dynamic_cast(_impl); std::vector aColumn; - for (size_t i = 0; i < theData.length(); i++) aColumn.push_back(std::string(CORBA::string_dup(theData[(_CORBA_ULong)i]))); //!< TODO: conversion from size_t to _CORBA_ULong + for (size_t i = 0; i < theData.length(); i++) aColumn.push_back(std::string(CORBA::string_dup(theData[(CORBA::ULong)i]))); //!< TODO: conversion from size_t to CORBA::ULong aTable->SetColumnData(theColumn, aColumn); } SALOMEDS::StringSeq* SALOMEDS_AttributeTableOfString_i::GetColumn(CORBA::Long theColumn) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); @@ -288,7 +273,7 @@ noexcept SALOMEDS::StringSeq_var CorbaSeq = new SALOMEDS::StringSeq; std::vector aColumn = aTable->GetColumnData(theColumn); - CorbaSeq->length((_CORBA_ULong)aColumn.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aColumn.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aColumn.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = CORBA::string_dup(aColumn[i].c_str()); } @@ -296,7 +281,6 @@ noexcept } void SALOMEDS_AttributeTableOfString_i::PutValue(const char* theValue, CORBA::Long theRow, CORBA::Long theColumn) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); @@ -314,7 +298,6 @@ CORBA::Boolean SALOMEDS_AttributeTableOfString_i::HasValue(CORBA::Long theRow, C } char* SALOMEDS_AttributeTableOfString_i::GetValue(CORBA::Long theRow, CORBA::Long theColumn) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); @@ -333,7 +316,6 @@ noexcept } void SALOMEDS_AttributeTableOfString_i::RemoveValue(CORBA::Long theRow, CORBA::Long theColumn) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); @@ -358,7 +340,7 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfString_i::GetRowSetIndices(CORBA::Lo SALOMEDS::LongSeq_var CorbaSeq = new SALOMEDS::LongSeq; std::vector aSeq = aTable->GetSetRowIndices(theRow); - CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aSeq.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = aSeq[i]; } @@ -401,7 +383,6 @@ SALOMEDS::TMPFile* SALOMEDS_AttributeTableOfString_i::SaveToFile() SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfString_i::SortRow(CORBA::Long theRow, SALOMEDS::AttributeTable::SortOrder sortOrder, SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); @@ -418,7 +399,7 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfString_i::SortRow(CORBA::Long theRow catch(...) { throw SALOMEDS::AttributeTable::IncorrectIndex(); } - CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aSeq.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = aSeq[i]; } @@ -428,7 +409,6 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfString_i::SortRow(CORBA::Long theRow SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfString_i::SortColumn(CORBA::Long theColumn, SALOMEDS::AttributeTable::SortOrder sortOrder, SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); @@ -445,7 +425,7 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfString_i::SortColumn(CORBA::Long the catch(...) { throw SALOMEDS::AttributeTable::IncorrectIndex(); } - CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aSeq.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = aSeq[i]; } @@ -455,7 +435,6 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfString_i::SortColumn(CORBA::Long the SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfString_i::SortByRow(CORBA::Long theRow, SALOMEDS::AttributeTable::SortOrder sortOrder, SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); @@ -472,7 +451,7 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfString_i::SortByRow(CORBA::Long theR catch(...) { throw SALOMEDS::AttributeTable::IncorrectIndex(); } - CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aSeq.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = aSeq[i]; } @@ -482,7 +461,6 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfString_i::SortByRow(CORBA::Long theR SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfString_i::SortByColumn(CORBA::Long theColumn, SALOMEDS::AttributeTable::SortOrder sortOrder, SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); @@ -499,7 +477,7 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfString_i::SortByColumn(CORBA::Long t catch(...) { throw SALOMEDS::AttributeTable::IncorrectIndex(); } - CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong + CorbaSeq->length((CORBA::ULong)aSeq.size()); //!< TODO: conversion from size_t to CORBA::ULong for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned CorbaSeq[i] = aSeq[i]; } @@ -508,7 +486,6 @@ SALOMEDS::LongSeq* SALOMEDS_AttributeTableOfString_i::SortByColumn(CORBA::Long t void SALOMEDS_AttributeTableOfString_i::SwapCells(CORBA::Long theRow1, CORBA::Long theColumn1, CORBA::Long theRow2, CORBA::Long theColumn2) - noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); @@ -528,7 +505,6 @@ void SALOMEDS_AttributeTableOfString_i::SwapCells(CORBA::Long theRow1, CORBA::Lo } void SALOMEDS_AttributeTableOfString_i::SwapRows(CORBA::Long theRow1, CORBA::Long theRow2) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); @@ -546,7 +522,6 @@ noexcept } void SALOMEDS_AttributeTableOfString_i::SwapColumns(CORBA::Long theColumn1, CORBA::Long theColumn2) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(ATS_IncorrectIndex); diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.hxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.hxx index 9f7de27bc..51042c884 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.hxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.hxx @@ -46,74 +46,49 @@ public: virtual void SetTitle(const char* theTitle); virtual char* GetTitle(); - virtual void SetRowTitle(CORBA::Long theIndex, const char* theTitle) - noexcept; - virtual char* GetRowTitle(CORBA::Long theIndex) - noexcept; - virtual void SetRowTitles(const SALOMEDS::StringSeq& theTitles) - noexcept; + virtual void SetRowTitle(CORBA::Long theIndex, const char* theTitle); + virtual char* GetRowTitle(CORBA::Long theIndex); + virtual void SetRowTitles(const SALOMEDS::StringSeq& theTitles); virtual SALOMEDS::StringSeq* GetRowTitles(); - virtual void SetColumnTitle(CORBA::Long theIndex, const char* theTitle) - noexcept; - virtual char* GetColumnTitle(CORBA::Long theIndex) - noexcept; - virtual void SetColumnTitles(const SALOMEDS::StringSeq& theTitles) - noexcept; + virtual void SetColumnTitle(CORBA::Long theIndex, const char* theTitle); + virtual char* GetColumnTitle(CORBA::Long theIndex); + virtual void SetColumnTitles(const SALOMEDS::StringSeq& theTitles); virtual SALOMEDS::StringSeq* GetColumnTitles(); - virtual void SetRowUnit(CORBA::Long theIndex, const char* theUnit) - noexcept; - virtual char* GetRowUnit(CORBA::Long theIndex) - noexcept; - virtual void SetRowUnits(const SALOMEDS::StringSeq& theUnits) - noexcept; + virtual void SetRowUnit(CORBA::Long theIndex, const char* theUnit); + virtual char* GetRowUnit(CORBA::Long theIndex); + virtual void SetRowUnits(const SALOMEDS::StringSeq& theUnits); virtual SALOMEDS::StringSeq* GetRowUnits(); virtual CORBA::Long GetNbRows(); virtual CORBA::Long GetNbColumns(); - virtual void AddRow(const SALOMEDS::StringSeq& theData) - noexcept; - virtual void SetRow(CORBA::Long theRow, const SALOMEDS::StringSeq& theData) - noexcept; - virtual SALOMEDS::StringSeq* GetRow(CORBA::Long theRow) - noexcept; - virtual void AddColumn(const SALOMEDS::StringSeq& theData) - noexcept; - virtual void SetColumn(CORBA::Long theColumn, const SALOMEDS::StringSeq& theData) - noexcept; - virtual SALOMEDS::StringSeq* GetColumn(CORBA::Long theColumn) - noexcept; - virtual void PutValue(const char* theValue, CORBA::Long theRow, CORBA::Long theColumn) - noexcept; + virtual void AddRow(const SALOMEDS::StringSeq& theData); + virtual void SetRow(CORBA::Long theRow, const SALOMEDS::StringSeq& theData); + virtual SALOMEDS::StringSeq* GetRow(CORBA::Long theRow); + virtual void AddColumn(const SALOMEDS::StringSeq& theData); + virtual void SetColumn(CORBA::Long theColumn, const SALOMEDS::StringSeq& theData); + virtual SALOMEDS::StringSeq* GetColumn(CORBA::Long theColumn); + virtual void PutValue(const char* theValue, CORBA::Long theRow, CORBA::Long theColumn); virtual CORBA::Boolean HasValue(CORBA::Long theRow, CORBA::Long theColumn); - virtual char* GetValue(CORBA::Long theRow, CORBA::Long theColumn) - noexcept; - virtual void RemoveValue(CORBA::Long theRow, CORBA::Long theColumn) - noexcept; + virtual char* GetValue(CORBA::Long theRow, CORBA::Long theColumn); + virtual void RemoveValue(CORBA::Long theRow, CORBA::Long theColumn); virtual SALOMEDS::LongSeq* GetRowSetIndices(CORBA::Long theRow); virtual void SetNbColumns(CORBA::Long theNbColumns); virtual SALOMEDS::LongSeq* SortRow(CORBA::Long theRow, SALOMEDS::AttributeTable::SortOrder sortOrder, - SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept; + SALOMEDS::AttributeTable::SortPolicy sortPolicy); virtual SALOMEDS::LongSeq* SortColumn(CORBA::Long theColumn, SALOMEDS::AttributeTable::SortOrder sortOrder, - SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept; + SALOMEDS::AttributeTable::SortPolicy sortPolicy); virtual SALOMEDS::LongSeq* SortByRow(CORBA::Long theRow, SALOMEDS::AttributeTable::SortOrder sortOrder, - SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept; + SALOMEDS::AttributeTable::SortPolicy sortPolicy); virtual SALOMEDS::LongSeq* SortByColumn(CORBA::Long theColumn, SALOMEDS::AttributeTable::SortOrder sortOrder, - SALOMEDS::AttributeTable::SortPolicy sortPolicy) - noexcept; + SALOMEDS::AttributeTable::SortPolicy sortPolicy); virtual void SwapCells(CORBA::Long theRow1, CORBA::Long theColumn1, - CORBA::Long theRow2, CORBA::Long theColumn2) - noexcept; - virtual void SwapRows(CORBA::Long theRow1, CORBA::Long theRow2) - noexcept; - virtual void SwapColumns(CORBA::Long theColumn1, CORBA::Long theColumn2) - noexcept; + CORBA::Long theRow2, CORBA::Long theColumn2); + virtual void SwapRows(CORBA::Long theRow1, CORBA::Long theRow2); + virtual void SwapColumns(CORBA::Long theColumn1, CORBA::Long theColumn2); virtual bool ReadFromFile(const SALOMEDS::TMPFile& theStream); virtual SALOMEDS::TMPFile* SaveToFile(); diff --git a/src/SALOMEDS/SALOMEDS_BasicAttributeFactory.hxx b/src/SALOMEDS/SALOMEDS_BasicAttributeFactory.hxx index 4438da7f9..773664179 100644 --- a/src/SALOMEDS/SALOMEDS_BasicAttributeFactory.hxx +++ b/src/SALOMEDS/SALOMEDS_BasicAttributeFactory.hxx @@ -41,8 +41,7 @@ public: BasicAttributeFactory() {}; virtual ~BasicAttributeFactory() {}; - SALOMEDS_BasicAttribute_i* Create(const char* type) - ; + SALOMEDS_BasicAttribute_i* Create(const char* type); }; #endif diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx index 1a841137a..a9a812a26 100644 --- a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx +++ b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx @@ -72,7 +72,7 @@ PortableServer::POA_ptr SALOMEDS_GenericAttribute_i::_default_POA() return PortableServer::POA::_duplicate(myPOA); } -void SALOMEDS_GenericAttribute_i::CheckLocked() noexcept +void SALOMEDS_GenericAttribute_i::CheckLocked() { SALOMEDS::Locker lock; Unexpect aCatch(GALockProtection); diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx index c00e95b38..0a4db44ec 100644 --- a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx +++ b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx @@ -50,7 +50,7 @@ public: virtual PortableServer::POA_ptr _default_POA(); - void CheckLocked() noexcept; + void CheckLocked(); virtual char* Type(); diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx index a7a904b70..f8835e719 100644 --- a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx +++ b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx @@ -207,7 +207,7 @@ void SALOMEDS_StudyBuilder_i::RemoveObjectWithChildren(SALOMEDS::SObject_ptr anO */ //============================================================================ void SALOMEDS_StudyBuilder_i::LoadWith(SALOMEDS::SComponent_ptr anSCO, - SALOMEDS::Driver_ptr aDriver) noexcept + SALOMEDS::Driver_ptr aDriver) { SALOMEDS::Locker lock; Unexpect aCatch(SBSalomeException); @@ -383,7 +383,7 @@ void SALOMEDS_StudyBuilder_i::NewCommand() * Purpose : */ //============================================================================ -void SALOMEDS_StudyBuilder_i::CommitCommand() noexcept +void SALOMEDS_StudyBuilder_i::CommitCommand() { SALOMEDS::Locker lock; Unexpect aCatch(SBLockProtection); @@ -423,7 +423,7 @@ void SALOMEDS_StudyBuilder_i::AbortCommand() * Purpose : */ //============================================================================ -void SALOMEDS_StudyBuilder_i::Undo() noexcept +void SALOMEDS_StudyBuilder_i::Undo() { SALOMEDS::Locker lock; Unexpect aCatch(SBLockProtection); @@ -441,7 +441,7 @@ void SALOMEDS_StudyBuilder_i::Undo() noexcept * Purpose : */ //============================================================================ -void SALOMEDS_StudyBuilder_i::Redo() noexcept +void SALOMEDS_StudyBuilder_i::Redo() { SALOMEDS::Locker lock; Unexpect aCatch(SBLockProtection); @@ -504,7 +504,7 @@ void SALOMEDS_StudyBuilder_i::UndoLimit(CORBA::Long n) * Purpose : */ //============================================================================ -void SALOMEDS_StudyBuilder_i::CheckLocked() noexcept +void SALOMEDS_StudyBuilder_i::CheckLocked() { SALOMEDS::Locker lock; Unexpect aCatch(SBLockProtection); @@ -522,7 +522,6 @@ void SALOMEDS_StudyBuilder_i::CheckLocked() noexcept */ //============================================================================ void SALOMEDS_StudyBuilder_i::SetName(SALOMEDS::SObject_ptr theSO, const char* theValue) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(SBLockProtection); @@ -539,7 +538,6 @@ noexcept */ //============================================================================ void SALOMEDS_StudyBuilder_i::SetComment(SALOMEDS::SObject_ptr theSO, const char* theValue) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(SBLockProtection); @@ -556,7 +554,6 @@ noexcept */ //============================================================================ void SALOMEDS_StudyBuilder_i::SetIOR(SALOMEDS::SObject_ptr theSO, const char* theValue) -noexcept { SALOMEDS::Locker lock; Unexpect aCatch(SBLockProtection); diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx index ff19f1649..f7160f5ca 100644 --- a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx +++ b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx @@ -90,8 +90,7 @@ public: */ virtual SALOMEDS::SObject_ptr NewObjectToTag(SALOMEDS::SObject_ptr theFatherObject, CORBA::Long atag); - virtual void LoadWith(SALOMEDS::SComponent_ptr sco, SALOMEDS::Driver_ptr Engine) - noexcept; + virtual void LoadWith(SALOMEDS::SComponent_ptr sco, SALOMEDS::Driver_ptr Engine); virtual void Load(SALOMEDS::SObject_ptr sco); virtual void RemoveObject(SALOMEDS::SObject_ptr anObject); @@ -109,11 +108,11 @@ public: virtual bool IsGUID(SALOMEDS::SObject_ptr anObject, const char* theGUID); virtual void NewCommand(); - virtual void CommitCommand() noexcept; + virtual void CommitCommand(); virtual CORBA::Boolean HasOpenCommand(); virtual void AbortCommand(); - virtual void Undo() noexcept; - virtual void Redo() noexcept; + virtual void Undo(); + virtual void Redo(); CORBA::Boolean GetAvailableUndos(); CORBA::Boolean GetAvailableRedos(); CORBA::Boolean IsSaved(); @@ -121,11 +120,11 @@ public: virtual CORBA::Long UndoLimit(); virtual void UndoLimit(CORBA::Long); - void CheckLocked() noexcept; + void CheckLocked(); - virtual void SetName(SALOMEDS::SObject_ptr theSO, const char* theValue) noexcept; - virtual void SetComment(SALOMEDS::SObject_ptr theSO, const char* theValue) noexcept; - virtual void SetIOR(SALOMEDS::SObject_ptr theSO, const char* theValue) noexcept; + virtual void SetName(SALOMEDS::SObject_ptr theSO, const char* theValue); + virtual void SetComment(SALOMEDS::SObject_ptr theSO, const char* theValue); + virtual void SetIOR(SALOMEDS::SObject_ptr theSO, const char* theValue); SALOMEDSImpl_StudyBuilder* GetImpl() { return _impl; } diff --git a/src/SALOMEDS/SALOMEDS_Study_i.hxx b/src/SALOMEDS/SALOMEDS_Study_i.hxx index 4e0f14d68..821414cc8 100644 --- a/src/SALOMEDS/SALOMEDS_Study_i.hxx +++ b/src/SALOMEDS/SALOMEDS_Study_i.hxx @@ -79,7 +79,7 @@ public: \param char* arguments, the study URL \return bool arguments */ - virtual bool Open(const wchar_t* aStudyUrl) ; + virtual bool Open(const wchar_t* aStudyUrl); //! method to check that a Study can be opened /*! @@ -107,7 +107,7 @@ public: /*! \param theObject object to paste */ - virtual SALOMEDS::SObject_ptr Paste(SALOMEDS::SObject_ptr theObject) ; + virtual SALOMEDS::SObject_ptr Paste(SALOMEDS::SObject_ptr theObject); virtual CORBA::Boolean CanPaste(SALOMEDS::SObject_ptr theObject); //! method to Get persistent reference of study (idem URL()) @@ -152,7 +152,7 @@ public: \return ListOfSObject_ptr arguments, a list of objects found */ - virtual SALOMEDS::Study::ListOfSObject* FindObjectByName( const char* anObjectName, const char* aComponentName ) ; + virtual SALOMEDS::Study::ListOfSObject* FindObjectByName( const char* anObjectName, const char* aComponentName ); //! method to Find an Object with ID = anObjectID /*! @@ -273,14 +273,14 @@ public: void EnableUseCaseAutoFilling(CORBA::Boolean isEnabled); // postponed destroying of CORBA object functionality - virtual void AddPostponed(const char* /*theIOR*/); + virtual void AddPostponed(const char* theIOR); - virtual void AddCreatedPostponed(const char* /*theIOR*/); + virtual void AddCreatedPostponed(const char* theIOR); virtual void RemovePostponed(CORBA::Long theUndoLimit); // removes postponed IORs of old transaction - // if theUndoLimit==0, removes all - virtual void UndoPostponed(CORBA::Long /*theWay*/); // theWay = 1: resurrect objects, - // theWay = -1: get back to the list of postponed + // if theUndoLimit==0, removes all + virtual void UndoPostponed(CORBA::Long theWay); // theWay = 1: resurrect objects, + // theWay = -1: get back to the list of postponed virtual SALOMEDS::AttributeParameter_ptr GetCommonParameters(const char* theID, CORBA::Long theSavePoint); virtual SALOMEDS::AttributeParameter_ptr GetModuleParameters(const char* theID, diff --git a/src/SALOMEDS/SALOMEDS_TMPFile_i.cxx b/src/SALOMEDS/SALOMEDS_TMPFile_i.cxx index e0bbb4ce7..93a563981 100644 --- a/src/SALOMEDS/SALOMEDS_TMPFile_i.cxx +++ b/src/SALOMEDS/SALOMEDS_TMPFile_i.cxx @@ -54,7 +54,7 @@ SALOMEDS_TMPFile_i if(theIndex < 0 || theIndex >= myStream->length()) throw std::out_of_range("SALOMEDS_TMPFile_i::Get(size_t) const - theIndex < 0 || theIndex >= myStream->length()"); - return myStream[(_CORBA_ULong)theIndex]; //!< TODO: conversion from size_t to _CORBA_ULong + return myStream[(CORBA::ULong)theIndex]; //!< TODO: conversion from size_t to CORBA::ULong } @@ -84,5 +84,5 @@ Engines_TMPFile_i if(theIndex < 0 || theIndex >= myStream->length()) throw std::out_of_range("Engines_TMPFile_i::Get(size_t) const - theIndex < 0 || theIndex >= myStream->length()"); - return myStream[(_CORBA_ULong)theIndex]; //!< TODO: conversion from size_t to _CROBA_ULong + return myStream[(CORBA::ULong)theIndex]; //!< TODO: conversion from size_t to _CROBA_ULong } diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx index 5681d487b..3524e180d 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx @@ -36,17 +36,14 @@ static std::string getUnit(std::string theString) { std::string aString(theString); size_t aPos = aString.find(SEPARATOR); - if(aPos <= 0 || aPos == aString.size() ) return std::string(); - return aString.substr(aPos+1, aString.size()); + return aPos >= aString.size()-1 ? std::string() : aString.substr(aPos+1); } static std::string getTitle(std::string theString) { std::string aString(theString); size_t aPos = aString.find(SEPARATOR); - if(aPos < 1) return aString; - if(aPos == 0) return std::string(); - return aString.substr(0, aPos); + return aPos == std::string::npos ? aString : aString.substr(0, aPos); } const std::string& SALOMEDSImpl_AttributeTableOfInteger::GetID() diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx index 5ba44468d..df3ef7040 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx @@ -36,14 +36,14 @@ static std::string getUnit(const std::string& theString) { std::string aString(theString); size_t aPos = aString.find(SEPARATOR); - return aPos < 0 || aPos == aString.size()-1 ? std::string() : aString.substr(aPos+1, aString.size()); + return aPos >= aString.size()-1 ? std::string() : aString.substr(aPos+1); } static std::string getTitle(const std::string& theString) { std::string aString(theString); size_t aPos = aString.find(SEPARATOR); - return aPos < 0 ? aString :aString.substr(0, aPos); + return aPos == std::string::npos ? aString : aString.substr(0, aPos); } const std::string& SALOMEDSImpl_AttributeTableOfReal::GetID() diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx index 7808991e5..892470dbc 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx @@ -36,17 +36,14 @@ static std::string getUnit(std::string theString) { std::string aString(theString); size_t aPos = aString.find(SEPARATOR); - if(aPos <= 0 || aPos == aString.size() ) return std::string(); - return aString.substr(aPos+1, aString.size()); + return aPos >= aString.size()-1 ? std::string() : aString.substr(aPos+1); } static std::string getTitle(std::string theString) { std::string aString(theString); size_t aPos = aString.find(SEPARATOR); - if(aPos < 1) return aString; - if(aPos == 0) return std::string(); - return aString.substr(0, aPos); + return aPos == std::string::npos ? aString : aString.substr(0, aPos); } const std::string& SALOMEDSImpl_AttributeTableOfString::GetID() diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.cxx index 63c69a935..6992d5fcd 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.cxx @@ -221,7 +221,7 @@ std::vector SALOMEDSImpl_IParameters::getProperties() std::string SALOMEDSImpl_IParameters::decodeEntry(const std::string& entry) { size_t pos = entry.rfind("_"); - if(pos < 0 || pos >= entry.size()) return entry; + if(pos >= entry.size()) return entry; std::string compName(entry, 0, pos), compID, tail(entry, pos+1, entry.length()-1); diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx index 6390249c5..23f2f9925 100644 --- 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; - size_t aStreamSize = 0; + long aStreamSize = 0; if (hdf_sco_group->ExistInternalObject("FILE_STREAM")) { HDFdataset *hdf_dataset = new HDFdataset("FILE_STREAM", hdf_sco_group); hdf_dataset->OpenOnDisk(); - aStreamSize = (size_t)hdf_dataset->GetSize(); + aStreamSize = hdf_dataset->GetSize(); aStreamFile = new unsigned char[aStreamSize]; if(aStreamFile == NULL) throw HDFexception("Unable to open dataset FILE_STREAM"); hdf_dataset->ReadFromDisk(aStreamFile); @@ -371,8 +371,8 @@ bool SALOMEDSImpl_StudyBuilder::LoadWith(const SALOMEDSImpl_SComponent& anSCO, bool aResult = true; if(aStreamFile && aStreamSize > 0 ) { aResult = (ASCIIfileState[0]=='A')? - aDriver->LoadASCII(anSCO, aStreamFile, (long)aStreamSize, aDir.c_str(), aMultifileState[0]=='M'): //!< TODO: conversion from size_t to const long - aDriver->Load(anSCO, aStreamFile, (long)aStreamSize, aDir.c_str(), aMultifileState[0]=='M'); //!< TODO: conversion from size_t to const long + aDriver->LoadASCII(anSCO, aStreamFile, aStreamSize, aDir.c_str(), aMultifileState[0]=='M'): //!< TODO: conversion from size_t to const long + aDriver->Load(anSCO, aStreamFile, aStreamSize, aDir.c_str(), aMultifileState[0]=='M'); //!< TODO: conversion from size_t to const long } if(aStreamFile != NULL) delete []aStreamFile; diff --git a/src/SALOMELocalTrace/FileTraceCollector.cxx b/src/SALOMELocalTrace/FileTraceCollector.cxx index c282e6645..4e722c12a 100644 --- a/src/SALOMELocalTrace/FileTraceCollector.cxx +++ b/src/SALOMELocalTrace/FileTraceCollector.cxx @@ -32,7 +32,6 @@ //#define _DEVDEBUG_ #include "FileTraceCollector.hxx" -#include "Basics_Utils.hxx" // Class attributes initialisation, for class method FileTraceCollector::run @@ -87,9 +86,8 @@ BaseTraceCollector* FileTraceCollector::instance(const char *fileName) */ // ============================================================================ -void* FileTraceCollector::run(void *bid) +void* FileTraceCollector::run(void* /*bid*/) { - SALOME_UNUSED(bid); //DEVTRACE("init run"); _threadId = new pthread_t; *_threadId = pthread_self(); diff --git a/src/SALOMELocalTrace/LocalTraceCollector.cxx b/src/SALOMELocalTrace/LocalTraceCollector.cxx index 8b2ffa43b..418db1d2a 100644 --- a/src/SALOMELocalTrace/LocalTraceCollector.cxx +++ b/src/SALOMELocalTrace/LocalTraceCollector.cxx @@ -30,7 +30,6 @@ #include #include -#include "Basics_Utils.hxx" #include "LocalTraceCollector.hxx" // ============================================================================ @@ -77,9 +76,8 @@ BaseTraceCollector* LocalTraceCollector::instance() */ // ============================================================================ -void* LocalTraceCollector::run(void *bid) +void* LocalTraceCollector::run(void* /*bid*/) { - SALOME_UNUSED(bid); _threadId = new pthread_t; *_threadId = pthread_self(); sem_post(&_sem); // unlock instance diff --git a/src/SALOMESDS/CMakeLists.txt b/src/SALOMESDS/CMakeLists.txt index 8ae23bba3..737f21eec 100644 --- a/src/SALOMESDS/CMakeLists.txt +++ b/src/SALOMESDS/CMakeLists.txt @@ -24,7 +24,6 @@ INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl ${PROJECT_BINARY_DIR}/salome_adm - ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../Utils ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService ${CMAKE_CURRENT_SOURCE_DIR}/../Launcher diff --git a/src/SALOMESDS/SALOMESDS_DataScopeServer.cxx b/src/SALOMESDS/SALOMESDS_DataScopeServer.cxx index fa24f9f2e..27157c310 100644 --- 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((_CORBA_ULong)sz); //!< TODO: size_t to _CORBA_ULong + 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;igetVarNameCpp()); - (*ret)[(_CORBA_ULong)i]=CORBA::string_dup(name.c_str()); //!< TODO: size_t to _CORBA_ULong + (*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((_CORBA_ULong)sz); //!< TODO: convert Py_ssize_t in _CORBA_ULong + ret->length((CORBA::ULong)sz); //!< TODO: convert Py_ssize_t in CORBA::ULong for(Py_ssize_t i=0;ipickelize(item));//item consumed - PickelizedPyObjServer::FromCppToByteSeq(pickel,(*ret)[(_CORBA_ULong)i]); //!< TODO: convert Py_ssize_t in _CORBA_ULong + 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[(_CORBA_ULong)i]); //!< TODO: size_t to _CORBA_ULong + eltBase=_poa->reference_to_servant(transactions[(CORBA::ULong)i]); //!< TODO: size_t to CORBA::ULong elt=dynamic_cast(eltBase); } catch(...) diff --git a/src/SALOMESDS/SALOMESDS_DataServerManager.cxx b/src/SALOMESDS/SALOMESDS_DataServerManager.cxx index 5f0098fa1..e8e94dd80 100644 --- a/src/SALOMESDS/SALOMESDS_DataServerManager.cxx +++ b/src/SALOMESDS/SALOMESDS_DataServerManager.cxx @@ -72,9 +72,9 @@ SALOME::StringVec *DataServerManager::listScopes() std::vector scopes(listOfScopesCpp()); SALOME::StringVec *ret(new SALOME::StringVec); std::size_t sz(scopes.size()); - ret->length((_CORBA_ULong)sz); //!< TODO: size_t to _CORBA_ULong + ret->length((CORBA::ULong)sz); //!< TODO: size_t to CORBA::ULong for(std::size_t i=0;ilength((_CORBA_ULong)sz); //!< TODO: size_t to _CORBA_ULong + ret->length((CORBA::ULong)sz); //!< TODO: size_t to CORBA::ULong for(std::size_t i=0;i(ret.c_str())); for(std::size_t i=0;i(&ret[0])); for(std::size_t i=0;i& bsToBeConv, SALOME::ByteVec& ret) { std::size_t sz(bsToBeConv.size()); - ret.length((_CORBA_ULong)sz); //!< TODO: size_t to _CORBA_ULong + ret.length((CORBA::ULong)sz); //!< TODO: size_t to CORBA::ULong for(std::size_t i=0;i -#include "Basics_Utils.hxx" #include #include @@ -91,9 +90,8 @@ BaseTraceCollector* SALOMETraceCollector::instance() */ // ============================================================================ -void* SALOMETraceCollector::run(void *bid) +void* SALOMETraceCollector::run(void* /*bid*/) { - SALOME_UNUSED(bid); _threadId = new pthread_t; *_threadId = pthread_self(); sem_post(&_sem); // unlock instance diff --git a/src/TOOLSDS/SALOMEDS_Tool.cxx b/src/TOOLSDS/SALOMEDS_Tool.cxx index 42d61a929..52ef338b1 100644 --- a/src/TOOLSDS/SALOMEDS_Tool.cxx +++ b/src/TOOLSDS/SALOMEDS_Tool.cxx @@ -340,10 +340,10 @@ SALOMEDS_Tool::PutStreamToFiles(const SALOMEDS::TMPFile& theStream, //Put a file name to aFileName memcpy(aFileName, (aBuffer + aCurrentPos), aFileNameSize); #ifdef WIN32 - for (i = 0; i < strlen(aFileName); i++) + for (int j = 0; j < strlen(aFileName); j++) { - if (aFileName[i] == ':') - aFileName[i] = '_'; + if (aFileName[j] == ':') + aFileName[j] = '_'; } #endif aCurrentPos += aFileNameSize; @@ -383,24 +383,24 @@ std::string SALOMEDS_Tool::GetNameFromPath(const std::string& thePath) { std::string aPath = thePath; bool isFound = false; size_t pos = aPath.rfind('/'); - if(pos > 0) { + if(pos != std::string::npos) { aPath = aPath.substr(pos+1, aPath.size()); isFound = true; } if(!isFound) { pos = aPath.rfind('\\'); - if(pos > 0) { + if(pos != std::string::npos) { aPath = aPath.substr(pos+1, aPath.size()); isFound = true; } } if(!isFound) { pos = aPath.rfind('|'); - if(pos > 0) aPath = aPath.substr(pos+1, aPath.size()); + if(pos != std::string::npos) aPath = aPath.substr(pos+1, aPath.size()); } pos = aPath.rfind('.'); - if(pos > 0) aPath = aPath.substr(0, pos); //Remove extension + if(pos != std::string::npos) aPath = aPath.substr(0, pos); //Remove extension return aPath; } @@ -414,16 +414,16 @@ std::string SALOMEDS_Tool::GetDirFromPath(const std::string& thePath) { size_t pos = thePath.rfind('/'); std::string path; - if(pos > 0) { + if(pos != std::string::npos) { path = thePath.substr(0, pos+1); } if(path.empty()) { pos = thePath.rfind('\\'); - if(pos > 0) path = thePath.substr(0, pos+1); + if(pos != std::string::npos) path = thePath.substr(0, pos+1); } if(path.empty()) { pos = thePath.rfind('|'); - if(pos > 0) path = thePath.substr(0, pos+1); + if(pos != std::string::npos) path = thePath.substr(0, pos+1); } if(path.empty()) { path = thePath+"/"; diff --git a/src/Utils/Utils_CommException.cxx b/src/Utils/Utils_CommException.cxx index 89cbbd73e..6188f9154 100644 --- a/src/Utils/Utils_CommException.cxx +++ b/src/Utils/Utils_CommException.cxx @@ -43,6 +43,6 @@ CommException::CommException( const CommException &ex ): SALOME_Exception( ex ) } -CommException::~CommException() +CommException::~CommException() noexcept { } diff --git a/src/Utils/Utils_CommException.hxx b/src/Utils/Utils_CommException.hxx index a252bee19..c68575f2a 100644 --- a/src/Utils/Utils_CommException.hxx +++ b/src/Utils/Utils_CommException.hxx @@ -39,7 +39,7 @@ public : CommException( void ); CommException( const char *texte ); CommException( const CommException &ex ); - ~CommException(); + ~CommException() noexcept; } ; # endif /* # if ( !defined __Utils_CommException_H__ ) */ diff --git a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx index f9f761c7f..464d4f91b 100644 --- a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx +++ b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx @@ -163,5 +163,5 @@ const int DESTRUCTEUR_GENERIQUE_::Ajout( DESTRUCTEUR_GENERIQUE_ &objet ) //CCRT assert(Destructeurs) ; Destructeurs->push_back( &objet ) ; - return static_cast(Destructeurs->size()) ; //TODO: return or ? + return (int)Destructeurs->size() ; //TODO: return or ? }