From 07a92167cec2452a14e2d17b71acd4a72666d25b Mon Sep 17 00:00:00 2001 From: Robert Butora Date: Tue, 15 Nov 2022 19:05:45 +0100 Subject: [PATCH] clears warnings about deprecated dynamic exception specifications --- src/Client.cpp | 6 +++--- src/Client.h | 4 ++-- src/DBManager.cpp | 16 ++++++++-------- src/DBManager.h | 16 ++++++++-------- src/DataImporter.cpp | 4 ++-- src/DataImporter.h | 4 ++-- src/FileWrapper.cpp | 4 ++-- src/FileWrapper.h | 4 ++-- src/ProtocolManager.cpp | 12 ++++++------ src/ProtocolManager.h | 12 ++++++------ 10 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/Client.cpp b/src/Client.cpp index f07a457..9ddf39d 100644 --- a/src/Client.cpp +++ b/src/Client.cpp @@ -543,7 +543,7 @@ void Client::resetConnection() // Client::encodeHeader() //============================================================================== void Client::encodeHeader(std::vector& buf, boost::uint32_t size) - throw(std::runtime_error) + /*throw(std::runtime_error)*/ { DEBUG_STREAM << "Client::encodeHeader()" << endl; @@ -560,7 +560,7 @@ void Client::encodeHeader(std::vector& buf, boost::uint32_t size // Client::decodeHeader() //============================================================================== boost::uint32_t Client::decodeHeader(std::vector& buf) - throw(std::runtime_error) + /*throw(std::runtime_error)*/ { DEBUG_STREAM << "Client::decodeHeader()" << endl; @@ -575,4 +575,4 @@ boost::uint32_t Client::decodeHeader(std::vector& buf) return size; } -} //namespace \ No newline at end of file +} //namespace diff --git a/src/Client.h b/src/Client.h index 8d77a29..b4ada07 100644 --- a/src/Client.h +++ b/src/Client.h @@ -136,10 +136,10 @@ protected: // [Protected] Header encoding decoding methods //------------------------------------------------------------------------------ virtual void encodeHeader(std::vector&, boost::uint32_t) - throw(std::runtime_error); + /*throw(std::runtime_error)*/; virtual boost::uint32_t decodeHeader(std::vector&) - throw(std::runtime_error); + /*throw(std::runtime_error)*/; //------------------------------------------------------------------------------ // [Protected] Class variables diff --git a/src/DBManager.cpp b/src/DBManager.cpp index 78f08ad..83d6a06 100644 --- a/src/DBManager.cpp +++ b/src/DBManager.cpp @@ -52,7 +52,7 @@ DBManager::SP DBManager::create(Tango::DeviceImpl* deviceImpl_p, //============================================================================== // DBManager::connect() //============================================================================== -void DBManager::connectAll() throw(soci::soci_error) +void DBManager::connectAll() /*throw(soci::soci_error)*/ { DEBUG_STREAM << "DBManager::connect()" << endl; @@ -149,7 +149,7 @@ DBManager::TransactionSP DBManager::getAuxTransaction() // DBManager::retrieveLastTimestamp() //============================================================================== boost::posix_time::ptime DBManager::retrieveLastTimestamp() - throw(soci::soci_error) + /*throw(soci::soci_error)*/ { DEBUG_STREAM << "DBManager::retrieveLastTimestamp()" << endl; @@ -173,7 +173,7 @@ boost::posix_time::ptime DBManager::retrieveLastTimestamp() // DBManager::persistLastTimestamp() //============================================================================== void DBManager::persistLastTimestamp(boost::posix_time::ptime ptime) - throw(soci::soci_error) + /*throw(soci::soci_error)*/ { DEBUG_STREAM << "DBManager::persistLastTimestamp()" << endl; @@ -193,7 +193,7 @@ void DBManager::persistLastTimestamp(boost::posix_time::ptime ptime) // DBManager::retrieveNewFiles() //============================================================================== DBManager::FileRowsetSP DBManager::retrieveNewFiles(boost::posix_time::ptime ptime) - throw(soci::soci_error) + /*throw(soci::soci_error)*/ { DEBUG_STREAM << "DBManager::retrieveNewFiles()" << endl; @@ -231,7 +231,7 @@ DBManager::FileRowsetSP DBManager::retrieveNewFiles(boost::posix_time::ptime pti // DBManager::updateNewFilePath() //============================================================================== void DBManager::updateNewFilePath(std::string storagePath, std::string filePath, - int fileVersion, std::string fileName) throw(soci::soci_error) + int fileVersion, std::string fileName) /*throw(soci::soci_error)*/ { DEBUG_STREAM << "DBManager::updateNewFilePath()" << endl; @@ -252,7 +252,7 @@ void DBManager::updateNewFilePath(std::string storagePath, std::string filePath, // DBManager::addFailedFile() //============================================================================== void DBManager::addFailedFile(int fileVersion, std::string fileName) - throw(soci::soci_error) + /*throw(soci::soci_error)*/ { DEBUG_STREAM << "DBManager::addFailedFile()" << endl; @@ -273,7 +273,7 @@ void DBManager::addFailedFile(int fileVersion, std::string fileName) // DBManager::removeFailedFile() //============================================================================== void DBManager::removeFailedFile(int fileVersion, std::string fileName) - throw(soci::soci_error) + /*throw(soci::soci_error)*/ { DEBUG_STREAM << "DBManager::removeFailedFile()" << endl; @@ -293,7 +293,7 @@ void DBManager::removeFailedFile(int fileVersion, std::string fileName) // DBManager::retrieveFailedFiles() //============================================================================== DBManager::FileRowsetSP DBManager::retrieveFailedFiles() - throw(soci::soci_error) + /*throw(soci::soci_error)*/ { DEBUG_STREAM << "DBManager::retrieveFailedFiles()" << endl; diff --git a/src/DBManager.h b/src/DBManager.h index 14f389f..7932937 100644 --- a/src/DBManager.h +++ b/src/DBManager.h @@ -63,7 +63,7 @@ public: //------------------------------------------------------------------------------ // [Public] Connections handling methods //------------------------------------------------------------------------------ - virtual void connectAll() throw(soci::soci_error); + virtual void connectAll() /*throw(soci::soci_error)*/; virtual void disconnectAll(); @@ -80,10 +80,10 @@ public: // [Public] Timestamp methods //------------------------------------------------------------------------------ virtual boost::posix_time::ptime retrieveLastTimestamp() - throw(soci::soci_error); + /*throw(soci::soci_error)*/; virtual void persistLastTimestamp(boost::posix_time::ptime) - throw(soci::soci_error); + /*throw(soci::soci_error)*/; //------------------------------------------------------------------------------ // [Public] File row set definition @@ -100,22 +100,22 @@ public: // [Public] New file method //------------------------------------------------------------------------------ virtual FileRowsetSP retrieveNewFiles(boost::posix_time::ptime) - throw(soci::soci_error); + /*throw(soci::soci_error)*/; virtual void updateNewFilePath(std::string, std::string, int, std::string) - throw(soci::soci_error); + /*throw(soci::soci_error)*/; //------------------------------------------------------------------------------ // [Public] Failed file methods //------------------------------------------------------------------------------ virtual void addFailedFile(int, std::string) - throw(soci::soci_error); + /*throw(soci::soci_error)*/; virtual void removeFailedFile(int, std::string) - throw(soci::soci_error); + /*throw(soci::soci_error)*/; virtual FileRowsetSP retrieveFailedFiles() - throw(soci::soci_error); + /*throw(soci::soci_error)*/; protected: //------------------------------------------------------------------------------ diff --git a/src/DataImporter.cpp b/src/DataImporter.cpp index d2c4e51..4811219 100644 --- a/src/DataImporter.cpp +++ b/src/DataImporter.cpp @@ -855,7 +855,7 @@ void DataImporter::decrementFailedCounter() // DataImporter::checkIfFileExists() //============================================================================== void DataImporter::checkIfFileExists(std::string fileName) - throw(std::invalid_argument) + /*throw(std::invalid_argument)*/ { DEBUG_STREAM << "DataImporter::checkIfFileExists() - " << device_name << endl; @@ -876,7 +876,7 @@ void DataImporter::checkIfFileExists(std::string fileName) // DataImporter::checkIfDirectoryExists() //============================================================================== void DataImporter::checkIfDirectoryExists(std::string directoryName) - throw(std::invalid_argument) + /*throw(std::invalid_argument)*/ { DEBUG_STREAM << "DataImporter::checkIfFileExists() - " << device_name << endl; diff --git a/src/DataImporter.h b/src/DataImporter.h index 91984f3..2063c8c 100644 --- a/src/DataImporter.h +++ b/src/DataImporter.h @@ -286,10 +286,10 @@ protected: // [Protected] Utilities methods //------------------------------------------------------------------------------ virtual void checkIfFileExists(std::string) - throw(std::invalid_argument); + /*throw(std::invalid_argument)*/; virtual void checkIfDirectoryExists(std::string) - throw(std::invalid_argument); + /*throw(std::invalid_argument)*/; /*----- PROTECTED REGION END -----*/ // DataImporter::Additional Method prototypes }; diff --git a/src/FileWrapper.cpp b/src/FileWrapper.cpp index f53e764..643f5cd 100644 --- a/src/FileWrapper.cpp +++ b/src/FileWrapper.cpp @@ -8,7 +8,7 @@ namespace DataImporter_ns //============================================================================== FileWrapper::FileWrapper(Tango::DeviceImpl* deviceImpl_p, std::string storagePath, std::string filePath, int fileVersion, - std::string fileName, boost::uint64_t totalFileSize) throw(std::logic_error) + std::string fileName, boost::uint64_t totalFileSize) /*throw(std::logic_error)*/ : Tango::LogAdapter(deviceImpl_p), m_storagePath(storagePath), m_filePath(filePath), m_fileVersion(fileVersion), m_fileName(fileName), m_expectedFileSize(totalFileSize) @@ -60,7 +60,7 @@ FileWrapper::~FileWrapper() FileWrapper::SP FileWrapper::create(Tango::DeviceImpl* deviceImpl_p, std::string storagePath, std::string filePath, int fileVersion, std::string fileName, boost::uint64_t fileSize) - throw(std::logic_error) + /*throw(std::logic_error)*/ { FileWrapper::SP d_sp(new FileWrapper(deviceImpl_p, storagePath, filePath, fileVersion, fileName, fileSize), FileWrapper::Deleter()); diff --git a/src/FileWrapper.h b/src/FileWrapper.h index c03ddb2..0a7596e 100644 --- a/src/FileWrapper.h +++ b/src/FileWrapper.h @@ -22,7 +22,7 @@ protected: // [Protected] Constructor destructor deleter //------------------------------------------------------------------------------ FileWrapper(Tango::DeviceImpl*, std::string, std::string, int, std::string, - boost::uint64_t) throw(std::logic_error); + boost::uint64_t) /*throw(std::logic_error)*/; virtual ~FileWrapper(); @@ -39,7 +39,7 @@ public: // [Public] Class creation method //------------------------------------------------------------------------------ static FileWrapper::SP create(Tango::DeviceImpl*, std::string, std::string, - int, std::string, boost::uint64_t) throw(std::logic_error); + int, std::string, boost::uint64_t) /*throw(std::logic_error)*/; //------------------------------------------------------------------------------ // [Public] Properties getter methods diff --git a/src/ProtocolManager.cpp b/src/ProtocolManager.cpp index 24fc65c..16caa4f 100644 --- a/src/ProtocolManager.cpp +++ b/src/ProtocolManager.cpp @@ -50,7 +50,7 @@ void ProtocolManager::setRemoteEndpoint(std::string remoteEndpoint) //============================================================================== // ProtocolManager::retrieveFiles() //============================================================================== -void ProtocolManager::retrieveFiles() throw(std::runtime_error) +void ProtocolManager::retrieveFiles() /*throw(std::runtime_error)*/ { DEBUG_STREAM << "ProtocolManager::retrieveFiles()" << endl; @@ -121,7 +121,7 @@ bool ProtocolManager::hasNextFile() //============================================================================== // ProtocolManager::createtRequest() //============================================================================== -RequestSP ProtocolManager::createtRequest() throw(std::runtime_error) +RequestSP ProtocolManager::createtRequest() /*throw(std::runtime_error)*/ { DEBUG_STREAM << "ProtocolManager::createtRequest()" << endl; @@ -145,7 +145,7 @@ RequestSP ProtocolManager::createtRequest() throw(std::runtime_error) // ProtocolManager::processResponse() //============================================================================== FileWrapper::SP ProtocolManager::processResponse(ResponseSP response_sp) - throw(std::logic_error, std::runtime_error) + /*throw(std::logic_error, std::runtime_error)*/ { DEBUG_STREAM << "ProtocolManager::processResponse()" << endl; @@ -190,7 +190,7 @@ FileWrapper::SP ProtocolManager::processResponse(ResponseSP response_sp) // ProtocolManager::setCurrentFileDownloaded() //============================================================================== void ProtocolManager::setCurrentFileDownloaded(FileWrapper::SP fileWrapper_sp) - throw(std::runtime_error) + /*throw(std::runtime_error)*/ { DEBUG_STREAM << "ProtocolManager::setCurrentFileDownloaded()" << endl; @@ -279,7 +279,7 @@ void ProtocolManager::setCurrentFileDownloaded(FileWrapper::SP fileWrapper_sp) //============================================================================== // ProtocolManager::setCurrentFileFailed() //============================================================================== -void ProtocolManager::setCurrentFileFailed() throw(std::runtime_error) +void ProtocolManager::setCurrentFileFailed() /*throw(std::runtime_error)*/ { DEBUG_STREAM << "ProtocolManager::setCurrentFileFailed()" << endl; @@ -373,7 +373,7 @@ bool ProtocolManager::isRecoveryTimeElapsed() // ProtocolManager::fillRequest() //============================================================================== RequestSP ProtocolManager::fillRequest(DBManager::FileRowset::const_iterator it) - throw(std::runtime_error) + /*throw(std::runtime_error)*/ { DEBUG_STREAM << "ProtocolManager::fillRequest()" << endl; diff --git a/src/ProtocolManager.h b/src/ProtocolManager.h index b5909ba..5eefb0f 100644 --- a/src/ProtocolManager.h +++ b/src/ProtocolManager.h @@ -61,7 +61,7 @@ public: //------------------------------------------------------------------------------ // [Public] Files lists methods //------------------------------------------------------------------------------ - virtual void retrieveFiles() throw(std::runtime_error); + virtual void retrieveFiles() /*throw(std::runtime_error)*/; virtual bool hasFilesToTransfer(); @@ -71,19 +71,19 @@ public: // [Public] Request response methods //------------------------------------------------------------------------------ RequestSP createtRequest() - throw(std::runtime_error); + /*throw(std::runtime_error)*/; FileWrapper::SP processResponse(ResponseSP) - throw(std::logic_error, std::runtime_error); + /*throw(std::logic_error, std::runtime_error)*/; //------------------------------------------------------------------------------ // [Public] Files status methods //------------------------------------------------------------------------------ virtual void setCurrentFileDownloaded(FileWrapper::SP) - throw(std::runtime_error); + /*throw(std::runtime_error)*/; virtual void setCurrentFileFailed() - throw(std::runtime_error); + /*throw(std::runtime_error)*/; protected: //------------------------------------------------------------------------------ @@ -95,7 +95,7 @@ protected: // [Protected] Fill request utility method //------------------------------------------------------------------------------ virtual RequestSP fillRequest(DBManager::FileRowset::const_iterator) - throw(std::runtime_error); + /*throw(std::runtime_error)*/; //------------------------------------------------------------------------------ // [Protected] Class variables -- GitLab