X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fcomm%2Fclient%2Fmain.cpp;h=c9663ece9a7247f83c15bd01fc105a97f1f2f4c0;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=81e240d2b24b1938fc4eacf3e33f0544d9a917e0;hpb=93366a0bda79e6fd6e7dad6316bfcf8cc82f5731;p=anna.git diff --git a/example/comm/client/main.cpp b/example/comm/client/main.cpp index 81e240d..c9663ec 100644 --- a/example/comm/client/main.cpp +++ b/example/comm/client/main.cpp @@ -40,9 +40,9 @@ public: a_txMessageCounter (0) {;} - void setMessageBySecond (const int messageBySecond) throw () { a_messageBySecond = messageBySecond; } + void setMessageBySecond (const int messageBySecond) { a_messageBySecond = messageBySecond; } - int getTxMessageCounter () const throw () { return a_txMessageCounter; } + int getTxMessageCounter () const { return a_txMessageCounter; } private: int a_messageBySecond; @@ -51,7 +51,7 @@ private: int a_txMessageCounter; ThreadData a_requests; - bool tick () throw (RuntimeException); + bool tick () noexcept(false); }; class MyCommunicator : public Communicator { @@ -64,26 +64,30 @@ private: int a_rxMessageCounter; void eventReceiveMessage (ClientSocket &, const Message&) - throw (RuntimeException); + noexcept(false); - void eventBreakConnection (const ClientSocket&) throw (); +protected: - void eventBreakConnection (Server* server) throw () { + using Communicator::eventBreakConnection; + + void eventBreakConnection (const ClientSocket&) ; + + void eventBreakConnection (Server* server) { comm::Communicator::eventBreakConnection (server); } - void eventBreakConnection (const Service* service) throw () { + void eventBreakConnection (const Service* service) { comm::Communicator::eventBreakConnection (service); } - static bool isOk (const test::Response& response) throw (); + static bool isOk (const test::Response& response) ; }; class HeavyClient : public anna::comm::Application { public: HeavyClient (); - Server* getServer () const throw () { return a_server; } - const Sender* getSender () const throw () { return &a_sender; } + Server* getServer () const { return a_server; } + const Sender* getSender () const { return &a_sender; } private: MyCommunicator a_communicator; @@ -91,8 +95,8 @@ private: Sender a_sender; Server* a_server; - void initialize () throw (RuntimeException); - void run () throw (RuntimeException); + void initialize () noexcept(false); + void run () noexcept(false); }; using namespace std; @@ -137,7 +141,7 @@ HeavyClient::HeavyClient () : } void HeavyClient::initialize () - throw (RuntimeException) + noexcept(false) { CommandLine& cl (CommandLine::instantiate ()); @@ -151,7 +155,7 @@ void HeavyClient::initialize () } void HeavyClient::run () - throw (RuntimeException) + noexcept(false) { a_timeController.activate (a_sender); @@ -159,7 +163,7 @@ void HeavyClient::run () } void MyCommunicator::eventReceiveMessage (ClientSocket&, const Message& message) - throw (RuntimeException) + noexcept(false) { test::Response& response = a_responses.get (); response.decode (message.getBody ()); @@ -192,7 +196,7 @@ void MyCommunicator::eventReceiveMessage (ClientSocket&, const Message& message) } void MyCommunicator::eventBreakConnection (const ClientSocket& clientSocket) - throw () + { if (a_rxMessageCounter == 0) return; @@ -213,7 +217,7 @@ void MyCommunicator::eventBreakConnection (const ClientSocket& clientSocket) } bool MyCommunicator::isOk (const test::Response& response) - throw () + { if (response.op != '+' && response.op != '-' && response.op != '*' && response.op != '/') return false; @@ -239,7 +243,7 @@ bool MyCommunicator::isOk (const test::Response& response) } bool Sender::tick () - throw (RuntimeException) + noexcept(false) { Server* server = static_cast (anna::app::functions::getApp ()).getServer (); Communicator* communicator = anna::app::functions::component (ANNA_FILE_LOCATION);