Commit 6b910274 authored by Robert Butora's avatar Robert Butora
Browse files

clears warnings about deprecated dynamic exception specifications

parent 6c6a0965

src/DBManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,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;
@@ -93,7 +93,7 @@ void DBManager::disconnect() 
//==============================================================================

DBManager::FileTuple DBManager::retrieveFileInfo(std::string schema,

    std::string table, int version, std::string name)

    throw(soci::soci_error)

    /*throw(soci::soci_error)*/

{

    DEBUG_STREAM << "DBManager::retrieveFileInfo()" << endl;

src/DBManager.h

+2 −2
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();
@@ -68,7 +68,7 @@ public: 
        boost::optional<std::string> > FileTuple;



    virtual FileTuple retrieveFileInfo(std::string, std::string, int, std::string)

        throw(soci::soci_error);

        /*throw(soci::soci_error)*/;



protected:

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

src/DataExporter.cpp

+3 −3
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ void DataExporter::off() 
//==============================================================================

void DataExporter::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 << "DataExporter::importExportedTables()  - " << device_name << endl;
@@ -650,7 +650,7 @@ void DataExporter::importExportedTables(std::vector<std::string>& exportedTables 
//==============================================================================

void DataExporter::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 << "DataExporter::importAuthorisedUsers()  - " << device_name << endl;
@@ -700,7 +700,7 @@ void DataExporter::importAuthorisedUsers(std::vector<std::string>& authorisedUse 
//      DataExporter::checkIfFileExists()

//==============================================================================

void DataExporter::checkIfFileExists(std::string fileName)

    throw(std::invalid_argument)

    /*throw(std::invalid_argument)*/

{

    DEBUG_STREAM << "DataExporter::checkIfFileExists()  - " << device_name << endl;

src/DataExporter.h

+3 −3
Original line number Diff line number Diff line
@@ -217,14 +217,14 @@ public: 
//------------------------------------------------------------------------------

    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 checkIfFileExists(std::string)

        throw(std::invalid_argument);

        /*throw(std::invalid_argument)*/;



/*----- PROTECTED REGION END -----*/	//	DataExporter::Additional Method prototypes

};

src/ProtocolManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,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;
@@ -174,7 +174,7 @@ bool ProtocolManager::isFileFound() 
//==============================================================================

//      ProtocolManager::getFileWrapper()

//==============================================================================

FileWrapper::SP ProtocolManager::getFileWrapper() throw(std::runtime_error)

FileWrapper::SP ProtocolManager::getFileWrapper() /*throw(std::runtime_error)*/

{

    DEBUG_STREAM << "ProtocolManager::getFileWrapper()" << endl;