X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcomm%2FRoundRobinDelivery.cpp;h=553dadc4cbb6140ec5a1d1f207468b44b4d7a302;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=7fd53538ce52a97fb802884ab9e2339e83b2b845;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git diff --git a/source/comm/RoundRobinDelivery.cpp b/source/comm/RoundRobinDelivery.cpp index 7fd5353..553dadc 100644 --- a/source/comm/RoundRobinDelivery.cpp +++ b/source/comm/RoundRobinDelivery.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// http://redmine.teslayout.com/projects/anna-suite -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of the copyright holder nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // #include @@ -56,13 +28,13 @@ using namespace std; using namespace anna; void comm::RoundRobinDelivery::do_initialize() -throw(RuntimeException) { +noexcept(false) { LOGMETHOD(TraceMethod tm("comm::RoundRobinDelivery", "do_initialize", ANNA_FILE_LOCATION)); a_iiserver = comm::Delivery::begin(); } comm::Resource* comm::RoundRobinDelivery::do_apply() -throw(RuntimeException) { +noexcept(false) { LOGMETHOD(TraceMethod tm(Logger::Local7, "comm::RoundRobinDelivery", "do_apply", ANNA_FILE_LOCATION)); comm::Resource* result = NULL; @@ -86,7 +58,7 @@ throw(RuntimeException) { } comm::RoundRobinDelivery::iterator comm::RoundRobinDelivery::advance() -throw() { +{ a_iiserver ++; if(a_iiserver == comm::Delivery::end()) @@ -96,7 +68,7 @@ throw() { } string comm::RoundRobinDelivery::asString() const -throw() { +{ string result = className(); result += " { "; result += comm::Service::asString(); @@ -104,7 +76,7 @@ throw() { } xml::Node* comm::RoundRobinDelivery::asXML(xml::Node* parent) const -throw() { +{ xml::Node* node = parent->createChild("comm.RoundRobinDelivery"); comm::Service::asXML(node); return node;