X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcomm%2FService.cpp;h=80c64a821cb400c51f42f204da9e4262daa7ce4a;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=f01ede2bdc079d313997c1185df5fc34df4a554c;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git

diff --git a/source/comm/Service.cpp b/source/comm/Service.cpp
index f01ede2..80c64a8 100644
--- a/source/comm/Service.cpp
+++ b/source/comm/Service.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// 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 Google Inc. 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 <anna/core/tracing/TraceMethod.hpp>
@@ -46,7 +18,7 @@ using namespace std;
 using namespace anna;
 
 void comm::Service::attach(comm::Server* server)
-throw(RuntimeException) {
+noexcept(false) {
   LOGMETHOD(TraceMethod tm(Logger::Local7, "comm::Service", "attach", ANNA_FILE_LOCATION));
   comm::Delivery::add(server);
   server->attach(this);
@@ -56,7 +28,7 @@ throw(RuntimeException) {
 // (1) Cuando no queda ningun recurso disponible se devuelve una excepcion
 //----------------------------------------------------------------------------------
 comm::Server* comm::Service::send(comm::Message& message)
-throw(RuntimeException) {
+noexcept(false) {
   LOGMETHOD(TraceMethod tm(Logger::Local7, "comm::Service", "send", ANNA_FILE_LOCATION));
   comm::Server* tryServer = NULL;
   comm::Server* init = NULL;
@@ -91,7 +63,7 @@ throw(RuntimeException) {
 }
 
 comm::Server* comm::Service::send(comm::Message* message)
-throw(RuntimeException) {
+noexcept(false) {
   if(message == NULL)
     throw RuntimeException("comm::Service::send | Cannot send a NULL message", ANNA_FILE_LOCATION);
 
@@ -99,7 +71,7 @@ throw(RuntimeException) {
 }
 
 int comm::Service::broadcast(comm::Message& message)
-throw() {
+{
   using namespace anna::comm;
   int result = 0;
 
@@ -122,7 +94,7 @@ throw() {
 }
 
 int comm::Service::broadcast(comm::Message* message)
-throw() {
+{
   if(message == NULL) {
     Logger::write(Logger::Error, "comm::Service::broadcast | Cannot broadcast a NULL message", ANNA_FILE_LOCATION);
     return 0;
@@ -132,7 +104,7 @@ throw() {
 }
 
 string comm::Service::asString() const
-throw() {
+{
   string result("comm::Service { ");
   result += Delivery::asString();
   result += " | Critical: ";
@@ -141,7 +113,7 @@ throw() {
 }
 
 xml::Node* comm::Service::asXML(xml::Node* parent) const
-throw() {
+{
   xml::Node* service = parent->createChild("comm.Service");
   Delivery::asXML(service);
   service->createAttribute("Critical", functions::asString(a_isCritical));
@@ -150,13 +122,13 @@ throw() {
 
 /*static*/
 comm::Server* comm::Service::server(comm::Delivery::iterator& ii)
-throw() {
+{
   return static_cast <Server*>(Delivery::resource(ii));
 }
 
 /*static*/
 const comm::Server* comm::Service::server(comm::Delivery::const_iterator& ii)
-throw() {
+{
   return static_cast <const Server*>(Delivery::resource(ii));
 }