From 2279ee49f831f5f6eef31bdc3ca5992cece73329 Mon Sep 17 00:00:00 2001 From: Robert Butora <robert.butora@inaf.it> Date: Tue, 15 Nov 2022 19:00:42 +0100 Subject: [PATCH] clears warnings about deprecated dynamic exception specifications --- src/DBManager.cpp | 6 +++--- src/DBManager.h | 6 +++--- src/MetadataExporter.cpp | 8 ++++---- src/MetadataExporter.h | 8 ++++---- src/ProtocolManager.cpp | 8 ++++---- src/ProtocolManager.h | 8 ++++---- src/Server.cpp | 6 +++--- src/Server.h | 4 ++-- src/Session.cpp | 4 ++-- src/Session.h | 4 ++-- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/DBManager.cpp b/src/DBManager.cpp index d540743..c538d42 100644 --- a/src/DBManager.cpp +++ b/src/DBManager.cpp @@ -43,7 +43,7 @@ DBManager::SP DBManager::create(Tango::DeviceImpl* deviceImpl_p, //============================================================================== // DBManager::connect() //============================================================================== -void DBManager::connect() throw(soci::soci_error) +void DBManager::connect() /*throw(soci::soci_error)*/ { DEBUG_STREAM << "DBManager::connect()" << endl; @@ -94,7 +94,7 @@ void DBManager::disconnect() // DBManager::retrieveInformation() //============================================================================== DBManager::InformationList DBManager::retrieveInformation(std::string schema, - std::string table) throw(soci::soci_error) + std::string table) /*throw(soci::soci_error)*/ { DEBUG_STREAM << "DBManager::retrieveInformation()" << endl; @@ -122,7 +122,7 @@ DBManager::InformationList DBManager::retrieveInformation(std::string schema, // DBManager::retrieveNewTuples() //============================================================================== DBManager::RowsetSP DBManager::retrieveNewTuples(std::string schema, - std::string table, std::tm update_time) throw(soci::soci_error, std::out_of_range) + std::string table, std::tm update_time) /*throw(soci::soci_error, std::out_of_range)*/ { DEBUG_STREAM << "DBManager::retrieveNewTuples()" << endl; diff --git a/src/DBManager.h b/src/DBManager.h index f56f351..040aa91 100644 --- a/src/DBManager.h +++ b/src/DBManager.h @@ -57,7 +57,7 @@ public: //------------------------------------------------------------------------------ // [Public] Connection management methods //------------------------------------------------------------------------------ - virtual void connect() throw(soci::soci_error); + virtual void connect() /*throw(soci::soci_error)*/; virtual void disconnect(); @@ -70,7 +70,7 @@ public: typedef std::vector< InformationTuple > InformationList; virtual InformationList retrieveInformation(std::string, - std::string) throw(soci::soci_error); + std::string) /*throw(soci::soci_error)*/; //------------------------------------------------------------------------------ // [Public] Retrieve new tuple method @@ -78,7 +78,7 @@ public: typedef boost::shared_ptr< soci::rowset<soci::row> > RowsetSP; virtual RowsetSP retrieveNewTuples(std::string, std::string, std::tm) - throw(soci::soci_error, std::out_of_range); + /*throw(soci::soci_error, std::out_of_range)*/; protected: //------------------------------------------------------------------------------ diff --git a/src/MetadataExporter.cpp b/src/MetadataExporter.cpp index 1db605a..7fe7652 100644 --- a/src/MetadataExporter.cpp +++ b/src/MetadataExporter.cpp @@ -630,7 +630,7 @@ void MetadataExporter::off() //============================================================================== void MetadataExporter::importExportedTables(std::vector<std::string>& exportedTables, std::multimap<const std::string, const std::string>& exportedTablesMap) - throw(std::invalid_argument) + /*throw(std::invalid_argument)*/ { DEBUG_STREAM << "MetadataExporter::importExportedTables() - " << device_name << endl; @@ -678,7 +678,7 @@ void MetadataExporter::importExportedTables(std::vector<std::string>& exportedTa //============================================================================== void MetadataExporter::importAuthorisedUsers(std::vector<std::string>& authorisedUsers, std::map<const std::string, const std::string>& authorisedUsersMap) - throw(std::invalid_argument) + /*throw(std::invalid_argument)*/ { DEBUG_STREAM << "MetadataExporter::importAuthorisedUsers() - " << device_name << endl; @@ -728,7 +728,7 @@ void MetadataExporter::importAuthorisedUsers(std::vector<std::string>& authorise // MetadataExporter::checkIfFileExists() //============================================================================== void MetadataExporter::checkIgnoreColumns(std::vector<std::string>& ignoreColumns) - throw(std::invalid_argument) + /*throw(std::invalid_argument)*/ { DEBUG_STREAM << "MetadataExporter::checkIgnoreColumns() - " << device_name << endl; @@ -763,7 +763,7 @@ void MetadataExporter::checkIgnoreColumns(std::vector<std::string>& ignoreColumn // MetadataExporter::checkIfFileExists() //============================================================================== void MetadataExporter::checkIfFileExists(std::string fileName) - throw(std::invalid_argument) + /*throw(std::invalid_argument)*/ { DEBUG_STREAM << "MetadataExporter::checkIfFileExists() - " << device_name << endl; diff --git a/src/MetadataExporter.h b/src/MetadataExporter.h index 18c8b0b..795d7bb 100644 --- a/src/MetadataExporter.h +++ b/src/MetadataExporter.h @@ -231,17 +231,17 @@ protected: //------------------------------------------------------------------------------ virtual void importExportedTables(std::vector<std::string>&, std::multimap<const std::string, const std::string>&) - throw(std::invalid_argument); + /*throw(std::invalid_argument)*/; virtual void importAuthorisedUsers(std::vector<std::string>&, std::map<const std::string, const std::string>&) - throw(std::invalid_argument); + /*throw(std::invalid_argument)*/; virtual void checkIgnoreColumns(std::vector<std::string>&) - throw(std::invalid_argument); + /*throw(std::invalid_argument)*/; virtual void checkIfFileExists(std::string) - throw(std::invalid_argument); + /*throw(std::invalid_argument)*/; /*----- PROTECTED REGION END -----*/ // MetadataExporter::Additional Method prototypes }; diff --git a/src/ProtocolManager.cpp b/src/ProtocolManager.cpp index 7e6a896..279fbdc 100644 --- a/src/ProtocolManager.cpp +++ b/src/ProtocolManager.cpp @@ -53,7 +53,7 @@ void ProtocolManager::setRemoteEndpoint(std::string remoteEndpoint) // ProtocolManager::prepareResponse() //============================================================================== ResponseSP ProtocolManager::prepareResponse(RequestSP request_sp) - throw(std::runtime_error) + /*throw(std::runtime_error)*/ { DEBUG_STREAM << "ProtocolManager::prepareResponse()" << endl; @@ -329,7 +329,7 @@ ResponseSP ProtocolManager::prepareMetadata(RequestSP request_sp) // ProtocolManager::validateColumn() //============================================================================== void ProtocolManager::validateColumn(const Request::Validation::Column& column, - DBManager::InformationList& informationList) throw(std::runtime_error) + DBManager::InformationList& informationList) /*throw(std::runtime_error)*/ { DEBUG_STREAM << "ProtocolManager::validateColumn()" << endl; @@ -392,7 +392,7 @@ void ProtocolManager::validateColumn(const Request::Validation::Column& column, // ProtocolManager::fillMetadata() //============================================================================== void ProtocolManager::fillMetadata(Response::Metadata* metadataRes) - throw(std::runtime_error, std::out_of_range) + /*throw(std::runtime_error, std::out_of_range)*/ { DEBUG_STREAM << "ProtocolManager::fillMetadata()" << endl; @@ -439,7 +439,7 @@ void ProtocolManager::fillMetadata(Response::Metadata* metadataRes) // ProtocolManager::fillRow() //============================================================================== void ProtocolManager::fillRow(Response::Metadata::Row* row) - throw(std::runtime_error, std::out_of_range) + /*throw(std::runtime_error, std::out_of_range)*/ { DEBUG_STREAM << "ProtocolManager::fillRow()" << endl; diff --git a/src/ProtocolManager.h b/src/ProtocolManager.h index 8d267f4..ced3437 100644 --- a/src/ProtocolManager.h +++ b/src/ProtocolManager.h @@ -57,7 +57,7 @@ public: // [Public] Request response management method //------------------------------------------------------------------------------ virtual ResponseSP prepareResponse(RequestSP) - throw(std::runtime_error); + /*throw(std::runtime_error)*/; protected: //------------------------------------------------------------------------------ @@ -73,16 +73,16 @@ protected: // [Protected] Columns validation method //------------------------------------------------------------------------------ virtual void validateColumn(const Request::Validation::Column&, - DBManager::InformationList&) throw(std::runtime_error); + DBManager::InformationList&) /*throw(std::runtime_error)*/; //------------------------------------------------------------------------------ // [Protected] Metadata serialization method //------------------------------------------------------------------------------ virtual void fillMetadata(Response::Metadata*) - throw(std::runtime_error, std::out_of_range); + /*throw(std::runtime_error, std::out_of_range)*/; virtual void fillRow(Response::Metadata::Row*) - throw(std::runtime_error, std::out_of_range); + /*throw(std::runtime_error, std::out_of_range)*/; //------------------------------------------------------------------------------ // [Protected] Class variables diff --git a/src/Server.cpp b/src/Server.cpp index 3c06d7d..b16eaa8 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -56,7 +56,7 @@ Server::~Server() //============================================================================== // Server::start() //============================================================================== -void Server::start() throw(std::runtime_error) +void Server::start() /*throw(std::runtime_error)*/ { DEBUG_STREAM << "Server::start()" << endl; @@ -103,7 +103,7 @@ void Server::start() throw(std::runtime_error) //============================================================================== // Server::stop() //============================================================================== -void Server::stop() throw(std::runtime_error) +void Server::stop() /*throw(std::runtime_error)*/ { DEBUG_STREAM << "Server::stop()" << endl; @@ -196,4 +196,4 @@ void Server::handleAccept(Session::SP session_sp, startAccept(); } -} //namespace \ No newline at end of file +} //namespace diff --git a/src/Server.h b/src/Server.h index 0c98dc4..b7621eb 100644 --- a/src/Server.h +++ b/src/Server.h @@ -34,9 +34,9 @@ public: //------------------------------------------------------------------------------ // [Public] Thread management methods //------------------------------------------------------------------------------ - virtual void start() throw(std::runtime_error); + virtual void start() /*throw(std::runtime_error)*/; - virtual void stop() throw(std::runtime_error); + virtual void stop() /*throw(std::runtime_error)*/; //------------------------------------------------------------------------------ // [Public] Read state and status methods diff --git a/src/Session.cpp b/src/Session.cpp index b05a1ab..8486564 100644 --- a/src/Session.cpp +++ b/src/Session.cpp @@ -100,7 +100,7 @@ void Session::handleWriteResponse(const boost::system::error_code& errorCode) // Session::encodeHeader() //============================================================================== void Session::encodeHeader(std::vector<boost::uint8_t>& buf, boost::uint32_t size) - throw(std::runtime_error) + /*throw(std::runtime_error)*/ { DEBUG_STREAM << "Session::encodeHeader()" << endl; @@ -117,7 +117,7 @@ void Session::encodeHeader(std::vector<boost::uint8_t>& buf, boost::uint32_t siz // Session::decodeHeader() //============================================================================== boost::uint32_t Session::decodeHeader(std::vector<boost::uint8_t>& buf) - throw(std::runtime_error) + /*throw(std::runtime_error)*/ { DEBUG_STREAM << "Session::decodeHeader()" << endl; diff --git a/src/Session.h b/src/Session.h index b373031..73e8006 100644 --- a/src/Session.h +++ b/src/Session.h @@ -67,10 +67,10 @@ protected: // [Protected] Encode decode header methods //------------------------------------------------------------------------------ virtual void encodeHeader(std::vector<boost::uint8_t>&, boost::uint32_t) - throw(std::runtime_error); + /*throw(std::runtime_error)*/; virtual boost::uint32_t decodeHeader(std::vector<boost::uint8_t>&) - throw(std::runtime_error); + /*throw(std::runtime_error)*/; //------------------------------------------------------------------------------ // [Protected] Class variables -- GitLab