Skip to content
Snippets Groups Projects
Commit 2279ee49 authored by Robert Butora's avatar Robert Butora
Browse files

clears warnings about deprecated dynamic exception specifications

parent 67a65f4d
No related branches found
No related tags found
No related merge requests found
...@@ -43,7 +43,7 @@ DBManager::SP DBManager::create(Tango::DeviceImpl* deviceImpl_p, ...@@ -43,7 +43,7 @@ DBManager::SP DBManager::create(Tango::DeviceImpl* deviceImpl_p,
//============================================================================== //==============================================================================
// DBManager::connect() // DBManager::connect()
//============================================================================== //==============================================================================
void DBManager::connect() throw(soci::soci_error) void DBManager::connect() /*throw(soci::soci_error)*/
{ {
DEBUG_STREAM << "DBManager::connect()" << endl; DEBUG_STREAM << "DBManager::connect()" << endl;
...@@ -94,7 +94,7 @@ void DBManager::disconnect() ...@@ -94,7 +94,7 @@ void DBManager::disconnect()
// DBManager::retrieveInformation() // DBManager::retrieveInformation()
//============================================================================== //==============================================================================
DBManager::InformationList DBManager::retrieveInformation(std::string schema, 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; DEBUG_STREAM << "DBManager::retrieveInformation()" << endl;
...@@ -122,7 +122,7 @@ DBManager::InformationList DBManager::retrieveInformation(std::string schema, ...@@ -122,7 +122,7 @@ DBManager::InformationList DBManager::retrieveInformation(std::string schema,
// DBManager::retrieveNewTuples() // DBManager::retrieveNewTuples()
//============================================================================== //==============================================================================
DBManager::RowsetSP DBManager::retrieveNewTuples(std::string schema, 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; DEBUG_STREAM << "DBManager::retrieveNewTuples()" << endl;
......
...@@ -57,7 +57,7 @@ public: ...@@ -57,7 +57,7 @@ public:
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// [Public] Connection management methods // [Public] Connection management methods
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
virtual void connect() throw(soci::soci_error); virtual void connect() /*throw(soci::soci_error)*/;
virtual void disconnect(); virtual void disconnect();
...@@ -70,7 +70,7 @@ public: ...@@ -70,7 +70,7 @@ public:
typedef std::vector< InformationTuple > InformationList; typedef std::vector< InformationTuple > InformationList;
virtual InformationList retrieveInformation(std::string, virtual InformationList retrieveInformation(std::string,
std::string) throw(soci::soci_error); std::string) /*throw(soci::soci_error)*/;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// [Public] Retrieve new tuple method // [Public] Retrieve new tuple method
...@@ -78,7 +78,7 @@ public: ...@@ -78,7 +78,7 @@ public:
typedef boost::shared_ptr< soci::rowset<soci::row> > RowsetSP; typedef boost::shared_ptr< soci::rowset<soci::row> > RowsetSP;
virtual RowsetSP retrieveNewTuples(std::string, std::string, std::tm) 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: protected:
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
......
...@@ -630,7 +630,7 @@ void MetadataExporter::off() ...@@ -630,7 +630,7 @@ void MetadataExporter::off()
//============================================================================== //==============================================================================
void MetadataExporter::importExportedTables(std::vector<std::string>& exportedTables, void MetadataExporter::importExportedTables(std::vector<std::string>& exportedTables,
std::multimap<const std::string, const std::string>& exportedTablesMap) std::multimap<const std::string, const std::string>& exportedTablesMap)
throw(std::invalid_argument) /*throw(std::invalid_argument)*/
{ {
DEBUG_STREAM << "MetadataExporter::importExportedTables() - " << device_name << endl; DEBUG_STREAM << "MetadataExporter::importExportedTables() - " << device_name << endl;
...@@ -678,7 +678,7 @@ void MetadataExporter::importExportedTables(std::vector<std::string>& exportedTa ...@@ -678,7 +678,7 @@ void MetadataExporter::importExportedTables(std::vector<std::string>& exportedTa
//============================================================================== //==============================================================================
void MetadataExporter::importAuthorisedUsers(std::vector<std::string>& authorisedUsers, void MetadataExporter::importAuthorisedUsers(std::vector<std::string>& authorisedUsers,
std::map<const std::string, const std::string>& authorisedUsersMap) std::map<const std::string, const std::string>& authorisedUsersMap)
throw(std::invalid_argument) /*throw(std::invalid_argument)*/
{ {
DEBUG_STREAM << "MetadataExporter::importAuthorisedUsers() - " << device_name << endl; DEBUG_STREAM << "MetadataExporter::importAuthorisedUsers() - " << device_name << endl;
...@@ -728,7 +728,7 @@ void MetadataExporter::importAuthorisedUsers(std::vector<std::string>& authorise ...@@ -728,7 +728,7 @@ void MetadataExporter::importAuthorisedUsers(std::vector<std::string>& authorise
// MetadataExporter::checkIfFileExists() // MetadataExporter::checkIfFileExists()
//============================================================================== //==============================================================================
void MetadataExporter::checkIgnoreColumns(std::vector<std::string>& ignoreColumns) void MetadataExporter::checkIgnoreColumns(std::vector<std::string>& ignoreColumns)
throw(std::invalid_argument) /*throw(std::invalid_argument)*/
{ {
DEBUG_STREAM << "MetadataExporter::checkIgnoreColumns() - " << device_name << endl; DEBUG_STREAM << "MetadataExporter::checkIgnoreColumns() - " << device_name << endl;
...@@ -763,7 +763,7 @@ void MetadataExporter::checkIgnoreColumns(std::vector<std::string>& ignoreColumn ...@@ -763,7 +763,7 @@ void MetadataExporter::checkIgnoreColumns(std::vector<std::string>& ignoreColumn
// MetadataExporter::checkIfFileExists() // MetadataExporter::checkIfFileExists()
//============================================================================== //==============================================================================
void MetadataExporter::checkIfFileExists(std::string fileName) void MetadataExporter::checkIfFileExists(std::string fileName)
throw(std::invalid_argument) /*throw(std::invalid_argument)*/
{ {
DEBUG_STREAM << "MetadataExporter::checkIfFileExists() - " << device_name << endl; DEBUG_STREAM << "MetadataExporter::checkIfFileExists() - " << device_name << endl;
......
...@@ -231,17 +231,17 @@ protected: ...@@ -231,17 +231,17 @@ protected:
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
virtual void importExportedTables(std::vector<std::string>&, virtual void importExportedTables(std::vector<std::string>&,
std::multimap<const std::string, const 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>&, virtual void importAuthorisedUsers(std::vector<std::string>&,
std::map<const std::string, const 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>&) virtual void checkIgnoreColumns(std::vector<std::string>&)
throw(std::invalid_argument); /*throw(std::invalid_argument)*/;
virtual void checkIfFileExists(std::string) virtual void checkIfFileExists(std::string)
throw(std::invalid_argument); /*throw(std::invalid_argument)*/;
/*----- PROTECTED REGION END -----*/ // MetadataExporter::Additional Method prototypes /*----- PROTECTED REGION END -----*/ // MetadataExporter::Additional Method prototypes
}; };
......
...@@ -53,7 +53,7 @@ void ProtocolManager::setRemoteEndpoint(std::string remoteEndpoint) ...@@ -53,7 +53,7 @@ void ProtocolManager::setRemoteEndpoint(std::string remoteEndpoint)
// ProtocolManager::prepareResponse() // ProtocolManager::prepareResponse()
//============================================================================== //==============================================================================
ResponseSP ProtocolManager::prepareResponse(RequestSP request_sp) ResponseSP ProtocolManager::prepareResponse(RequestSP request_sp)
throw(std::runtime_error) /*throw(std::runtime_error)*/
{ {
DEBUG_STREAM << "ProtocolManager::prepareResponse()" << endl; DEBUG_STREAM << "ProtocolManager::prepareResponse()" << endl;
...@@ -329,7 +329,7 @@ ResponseSP ProtocolManager::prepareMetadata(RequestSP request_sp) ...@@ -329,7 +329,7 @@ ResponseSP ProtocolManager::prepareMetadata(RequestSP request_sp)
// ProtocolManager::validateColumn() // ProtocolManager::validateColumn()
//============================================================================== //==============================================================================
void ProtocolManager::validateColumn(const Request::Validation::Column& column, 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; DEBUG_STREAM << "ProtocolManager::validateColumn()" << endl;
...@@ -392,7 +392,7 @@ void ProtocolManager::validateColumn(const Request::Validation::Column& column, ...@@ -392,7 +392,7 @@ void ProtocolManager::validateColumn(const Request::Validation::Column& column,
// ProtocolManager::fillMetadata() // ProtocolManager::fillMetadata()
//============================================================================== //==============================================================================
void ProtocolManager::fillMetadata(Response::Metadata* metadataRes) 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; DEBUG_STREAM << "ProtocolManager::fillMetadata()" << endl;
...@@ -439,7 +439,7 @@ void ProtocolManager::fillMetadata(Response::Metadata* metadataRes) ...@@ -439,7 +439,7 @@ void ProtocolManager::fillMetadata(Response::Metadata* metadataRes)
// ProtocolManager::fillRow() // ProtocolManager::fillRow()
//============================================================================== //==============================================================================
void ProtocolManager::fillRow(Response::Metadata::Row* row) 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; DEBUG_STREAM << "ProtocolManager::fillRow()" << endl;
......
...@@ -57,7 +57,7 @@ public: ...@@ -57,7 +57,7 @@ public:
// [Public] Request response management method // [Public] Request response management method
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
virtual ResponseSP prepareResponse(RequestSP) virtual ResponseSP prepareResponse(RequestSP)
throw(std::runtime_error); /*throw(std::runtime_error)*/;
protected: protected:
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
...@@ -73,16 +73,16 @@ protected: ...@@ -73,16 +73,16 @@ protected:
// [Protected] Columns validation method // [Protected] Columns validation method
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
virtual void validateColumn(const Request::Validation::Column&, virtual void validateColumn(const Request::Validation::Column&,
DBManager::InformationList&) throw(std::runtime_error); DBManager::InformationList&) /*throw(std::runtime_error)*/;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// [Protected] Metadata serialization method // [Protected] Metadata serialization method
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
virtual void fillMetadata(Response::Metadata*) 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*) 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 // [Protected] Class variables
......
...@@ -56,7 +56,7 @@ Server::~Server() ...@@ -56,7 +56,7 @@ Server::~Server()
//============================================================================== //==============================================================================
// Server::start() // Server::start()
//============================================================================== //==============================================================================
void Server::start() throw(std::runtime_error) void Server::start() /*throw(std::runtime_error)*/
{ {
DEBUG_STREAM << "Server::start()" << endl; DEBUG_STREAM << "Server::start()" << endl;
...@@ -103,7 +103,7 @@ void Server::start() throw(std::runtime_error) ...@@ -103,7 +103,7 @@ void Server::start() throw(std::runtime_error)
//============================================================================== //==============================================================================
// Server::stop() // Server::stop()
//============================================================================== //==============================================================================
void Server::stop() throw(std::runtime_error) void Server::stop() /*throw(std::runtime_error)*/
{ {
DEBUG_STREAM << "Server::stop()" << endl; DEBUG_STREAM << "Server::stop()" << endl;
......
...@@ -34,9 +34,9 @@ public: ...@@ -34,9 +34,9 @@ public:
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// [Public] Thread management methods // [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 // [Public] Read state and status methods
......
...@@ -100,7 +100,7 @@ void Session::handleWriteResponse(const boost::system::error_code& errorCode) ...@@ -100,7 +100,7 @@ void Session::handleWriteResponse(const boost::system::error_code& errorCode)
// Session::encodeHeader() // Session::encodeHeader()
//============================================================================== //==============================================================================
void Session::encodeHeader(std::vector<boost::uint8_t>& buf, boost::uint32_t size) 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; DEBUG_STREAM << "Session::encodeHeader()" << endl;
...@@ -117,7 +117,7 @@ void Session::encodeHeader(std::vector<boost::uint8_t>& buf, boost::uint32_t siz ...@@ -117,7 +117,7 @@ void Session::encodeHeader(std::vector<boost::uint8_t>& buf, boost::uint32_t siz
// Session::decodeHeader() // Session::decodeHeader()
//============================================================================== //==============================================================================
boost::uint32_t Session::decodeHeader(std::vector<boost::uint8_t>& buf) boost::uint32_t Session::decodeHeader(std::vector<boost::uint8_t>& buf)
throw(std::runtime_error) /*throw(std::runtime_error)*/
{ {
DEBUG_STREAM << "Session::decodeHeader()" << endl; DEBUG_STREAM << "Session::decodeHeader()" << endl;
......
...@@ -67,10 +67,10 @@ protected: ...@@ -67,10 +67,10 @@ protected:
// [Protected] Encode decode header methods // [Protected] Encode decode header methods
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
virtual void encodeHeader(std::vector<boost::uint8_t>&, boost::uint32_t) 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>&) virtual boost::uint32_t decodeHeader(std::vector<boost::uint8_t>&)
throw(std::runtime_error); /*throw(std::runtime_error)*/;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// [Protected] Class variables // [Protected] Class variables
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment