X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcomm%2Finternal%2FLocalConnection.hpp;h=37c16d327af8c05a37e4c89d281c2de006df6c96;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=4b0a31fef02bef5d707b2df328f2a74f34a355c8;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/include/anna/comm/internal/LocalConnection.hpp b/include/anna/comm/internal/LocalConnection.hpp
index 4b0a31f..37c16d3 100644
--- a/include/anna/comm/internal/LocalConnection.hpp
+++ b/include/anna/comm/internal/LocalConnection.hpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not 'N' 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 //
 
 
 #ifndef anna_comm_internal_LocalConnection_hpp
@@ -68,39 +40,39 @@ public:
      socket cliente no est�asociado a ningn servidor de sockets.
      \return El servidor de socket a partir del cual se cre este socket cliente.
   */
-  ServerSocket* getServerSocket() const throw() { return a_serverSocket; }
+  ServerSocket* getServerSocket() const { return a_serverSocket; }
 
   /**
      Devuelve el socket cliente  asociado a esta conexion. Puede ser NULL si la conexion no ha sido establecida.
      \return El socket cliente asociado a esta conexion.
   */
-  ClientSocket* getClientSocket() throw() { return a_clientSocket; }
+  ClientSocket* getClientSocket() { return a_clientSocket; }
 
   /**
      Devuelve una cadena con la informacin referente a este socket.
      \return Una cadena con la informacin referente a este socket.
   */
-  std::string asString() const throw();
+  std::string asString() const ;
 
   /**
      Devuelve un nodo XML con la informacin referente a este objeto.
      \param parent Nodo XML a partir del cual introducir la informacin.
      \return Un nodo XML con la informacin referente a este objeto.
   */
-  xml::Node* asXML(xml::Node* parent) const throw(RuntimeException);
+  xml::Node* asXML(xml::Node* parent) const noexcept(false);
 
   /**
      Devuelve el nombre logico de esta clase.
      \return el nombre logico de esta clase.
   */
-  static const char* className() throw() { return "anna::comm::LocalConnection"; }
+  static const char* className() { return "anna::comm::LocalConnection"; }
 
 private:
   ServerSocket* a_serverSocket;
   ClientSocket* a_clientSocket;
 
-  void setServerSocket(ServerSocket* serverSocket) throw() { a_serverSocket = serverSocket; }
-  void setClientSocket(ClientSocket* clientSocket) throw() { a_clientSocket = clientSocket; }
+  void setServerSocket(ServerSocket* serverSocket) { a_serverSocket = serverSocket; }
+  void setClientSocket(ClientSocket* clientSocket) { a_clientSocket = clientSocket; }
 
   friend class ServerSocket;
   friend class handler::ServerSocket;