X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fcomm%2FrrkClient%2Fmain.cpp;h=3c0e0de598c0dd510d3fbdbf5f0b7f61478c4251;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=c70f295007fc22f067939b89314f7eb9109f511f;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git diff --git a/example/comm/rrkClient/main.cpp b/example/comm/rrkClient/main.cpp index c70f295..3c0e0de 100644 --- a/example/comm/rrkClient/main.cpp +++ b/example/comm/rrkClient/main.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 // /* @@ -60,24 +32,24 @@ private: test::Response a_response; test::Request a_request; - void eventReceiveMessage (ClientSocket&, const Message&) throw (RuntimeException); - void eventUser (const char* id, const void* context) throw (); + void eventReceiveMessage (ClientSocket&, const Message&) noexcept(false); + void eventUser (const char* id, const void* context) ; }; class RRKClient : public anna::comm::Application { public: RRKClient (); - Service* getService () const throw () { return a_service; } - const test::Menu& getMenu () const throw () { return a_menu; } + Service* getService () const { return a_service; } + const test::Menu& getMenu () const { return a_menu; } private: MyCommunicator a_communicator; test::Menu a_menu; Service* a_service; - void initialize () throw (RuntimeException); - void run () throw (RuntimeException); + void initialize () noexcept(false); + void run () noexcept(false); }; using namespace std; @@ -110,13 +82,13 @@ RRKClient::RRKClient () : { CommandLine& commandLine (CommandLine::instantiate ()); - commandLine.add ("p", CommandLine::Argument::Mandatory, "Puerto en el que el servidor atiende respuestas."); + commandLine.add ("p", CommandLine::Argument::Mandatory, "Puertos en los que el servidor atiende respuestas."); commandLine.add ("a", CommandLine::Argument::Mandatory, "Puertos en los que hay servidores atendiendo peticiones"); commandLine.add ("trace", CommandLine::Argument::Optional, "Nivel de trazas (debug,warning, error,...)"); } void RRKClient::initialize () - throw (RuntimeException) + noexcept(false) { CommandLine& cl (CommandLine::instantiate ()); @@ -140,14 +112,14 @@ void RRKClient::initialize () } void RRKClient::run () - throw (RuntimeException) + noexcept(false) { a_menu.paint (); a_communicator.accept (); } void MyCommunicator::eventReceiveMessage (ClientSocket&, const Message& message) - throw (RuntimeException) + noexcept(false) { LOGMETHOD (TraceMethod tm (Logger::Local7, "MyCommunicator", "eventReceiveMessage", ANNA_FILE_LOCATION)); @@ -166,7 +138,7 @@ void MyCommunicator::eventReceiveMessage (ClientSocket&, const Message& message) // notifica al comunicador mediante un evento de usuario. //----------------------------------------------------------------------------------------- void MyCommunicator::eventUser (const char* id, const void* context) - throw () + { LOGMETHOD (TraceMethod tm (Logger::Local7, "MyCommunicator", "eventUser", ANNA_FILE_LOCATION));