X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=source%2Fcomm%2FDelivery.cpp;fp=source%2Fcomm%2FDelivery.cpp;h=51b005c7df1e117d6d4ec79c0dc77e58f7cfa405;hp=37a03cc6ae9e6cdb6ebf1a3eef372f33f9364388;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hpb=af9c86ffb0e28d35ad94d99c5f77e41578c972b4 diff --git a/source/comm/Delivery.cpp b/source/comm/Delivery.cpp index 37a03cc..51b005c 100644 --- a/source/comm/Delivery.cpp +++ b/source/comm/Delivery.cpp @@ -24,7 +24,7 @@ using namespace anna; const Millisecond comm::Delivery::DefaultRecoveryTime(60000); void comm::Delivery::initialize() -throw(RuntimeException) { +noexcept(false) { LOGMETHOD(TraceMethod tm("comm::Delivery", "initialize", ANNA_FILE_LOCATION)); // No es necesario protegerlo porque cuando se ejecuta todavía estarmos en la parte // en la que no se han lanzado los thread's @@ -58,7 +58,7 @@ throw(RuntimeException) { // los recursos con fallos internos. //--------------------------------------------------------------------------------------------- comm::Resource* comm::Delivery::apply() -throw(RuntimeException) { +noexcept(false) { LOGMETHOD(TraceMethod tm(Logger::Local7, "comm::Delivery", "apply", ANNA_FILE_LOCATION)); Guard guard(*this, "comm::Delivery::apply"); @@ -102,7 +102,7 @@ throw(RuntimeException) { } bool comm::Delivery::fault(const Resource* resource) -throw() { +{ LOGMETHOD(TraceMethod tm(Logger::Local7, "comm::Delivery", "fault", ANNA_FILE_LOCATION)); if(resource == NULL) @@ -138,7 +138,7 @@ throw() { } bool comm::Delivery::recover(const Resource* resource) -throw() { +{ if(resource == NULL) return a_isAvailable; @@ -148,7 +148,7 @@ throw() { } bool comm::Delivery::unsafe_recover(const Resource* resource) -throw() { +{ LOGMETHOD(TraceMethod tm(Logger::Local7, "comm::Delivery", "unsafe_recover", ANNA_FILE_LOCATION)); if(find(comm::Delivery::begin(), end(), resource) == end()) // (1) @@ -166,7 +166,7 @@ throw() { } bool comm::Delivery::contains(const Resource* resource) const -throw() { +{ if(resource == NULL) return false; @@ -176,13 +176,13 @@ throw() { // Devolverá true si no tiene disponible ninguno de los recursos asociados. bool comm::Delivery::do_fault(const Resource* resource) -throw() { +{ return (isAvailable() == true) ? false : true; } // Devolverá true si tiene disponible alguno de los recursos que tiene asociados. bool comm::Delivery::do_recover(const Resource* resource) -throw() { +{ return isAvailable(); } @@ -193,7 +193,7 @@ throw() { // //------------------------------------------------------------------------------------------- bool comm::Delivery::isAvailable() const -throw() { +{ bool result(false); for(const_iterator ii = begin(), maxii = end(); ii != maxii; ii ++) { @@ -209,7 +209,7 @@ throw() { } void comm::Delivery::add(Resource* resource) -throw(RuntimeException) { +noexcept(false) { if(resource == NULL) { string msg(asString()); msg += " | Cannot attach a NULL resource"; @@ -232,7 +232,7 @@ throw(RuntimeException) { } bool comm::Delivery::do_contains(const comm::Resource* resource) const -throw() { +{ for(const_iterator ii = begin(), maxii = end(); ii != maxii; ii ++) if(*Delivery::resource(ii) == *resource) return true; @@ -241,7 +241,7 @@ throw() { } string comm::Delivery::asString() const -throw() { +{ string result("comm::Delivery { Name: "); result += a_name; result += functions::asText(" | Available: ", a_isAvailable); @@ -255,7 +255,7 @@ throw() { } xml::Node* comm::Delivery::asXML(xml::Node* parent) const -throw() { +{ xml::Node* node = parent->createChild("comm.Delivery"); node->createAttribute("Name", a_name); node->createAttribute("Available", functions::asString(a_isAvailable)); @@ -284,7 +284,7 @@ throw() { */ /*static*/ bool comm::Delivery::internalErrorDetected(const Resource* resource) -throw() { +{ return resource->isEnabled() == false && resource->isAvailable() == true; }