Commit 2279ee49 authored by Robert Butora's avatar Robert Butora
Browse files

clears warnings about deprecated dynamic exception specifications

parent 67a65f4d

src/DBManager.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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;

src/DBManager.h

+3 −3
Original line number Diff line number Diff line
@@ -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:

//------------------------------------------------------------------------------

src/MetadataExporter.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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;

src/MetadataExporter.h

+4 −4
Original line number Diff line number Diff line
@@ -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

};

src/ProtocolManager.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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;