X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=source%2Fdbms%2FDatabase.cpp;fp=source%2Fdbms%2FDatabase.cpp;h=4349d7e3b13d4757bddb675ac65398579ae32230;hp=987038f4b97d399fcb201696eeb8622711063c10;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hpb=af9c86ffb0e28d35ad94d99c5f77e41578c972b4 diff --git a/source/dbms/Database.cpp b/source/dbms/Database.cpp index 987038f..4349d7e 100644 --- a/source/dbms/Database.cpp +++ b/source/dbms/Database.cpp @@ -44,7 +44,7 @@ Database::~Database() { } void Database::do_initialize() -throw(RuntimeException) { +noexcept(false) { LOGMETHOD(TraceMethod tm("dbms::Database", "do_initialize", ANNA_FILE_LOCATION)); int counter(0); bool error = false; @@ -71,7 +71,7 @@ throw(RuntimeException) { } void Database::do_stop() -throw() { +{ LOGMETHOD(TraceMethod tm("dbms::Database", "do_stop", ANNA_FILE_LOCATION)); try { @@ -96,7 +96,7 @@ throw() { * padre) y se abre una nueva conexion con los mismos parametros y contra la misma base de datos. */ void Database::do_cloneChild() -throw(RuntimeException) { +noexcept(false) { LOGMETHOD(TraceMethod tm("dbms::Database", "do_cloneChild", ANNA_FILE_LOCATION)); for(connection_iterator ii = connection_begin(), maxii = connection_end(); ii != maxii; ii ++) { @@ -111,7 +111,7 @@ throw(RuntimeException) { } Connection* Database::createConnection(const char* name, const char* user, const char* password) -throw(RuntimeException, DatabaseException) { +noexcept(false) { Guard guard(this, "dbms::Database (createConnection)"); if(a_connections.size() >= MaxConnection) { @@ -169,7 +169,7 @@ throw(RuntimeException, DatabaseException) { } Connection& Database::findConnection(const char* name) -throw(RuntimeException) { +noexcept(false) { Guard guard(this, "dbms::Database (findConnection)"); Connection* result = NULL; @@ -207,7 +207,7 @@ throw(RuntimeException) { } Statement* Database::createStatement(const char* name, const char* expression, const bool isCritical) -throw(RuntimeException) { +noexcept(false) { if(findStatement(name) != NULL) throw RuntimeException(functions::asString("Sentence: %s | Name already in use", name), ANNA_FILE_LOCATION); @@ -232,7 +232,7 @@ throw(RuntimeException) { } Statement* Database::findStatement(const char* name) -throw() { +{ Guard guard(this, "dbms::Database::findStatement"); vector ::iterator ii, maxii; Statement* result(NULL); @@ -248,7 +248,7 @@ throw() { } void Database::releaseStatement(Statement* statement) -throw() { +{ if(statement == NULL) { Logger::write(Logger::Warning, asString(), "Cannot release a NULL SQL sentence", ANNA_FILE_LOCATION); return; @@ -270,7 +270,7 @@ throw() { } void Database::recover(Connection& connection, const int tryCounter) -throw(RuntimeException) { +noexcept(false) { try { connection.close(); connection.open(); @@ -283,7 +283,7 @@ throw(RuntimeException) { } string Database::asString() const -throw() { +{ string result("dbms::Database { "); result += Component::asString(); @@ -298,7 +298,7 @@ throw() { } xml::Node* Database::asXML(xml::Node* parent) const -throw() { +{ parent = Component::asXML(parent); xml::Node* result = parent->createChild("dbms.Database"); xml::Node* node;