projects
/
anna.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix local server for multiple applications
[anna.git]
/
example
/
comm
/
rrClient
/
main.cpp
diff --git
a/example/comm/rrClient/main.cpp
b/example/comm/rrClient/main.cpp
index
5e47a25
..
9a1ba5f
100644
(file)
--- a/
example/comm/rrClient/main.cpp
+++ b/
example/comm/rrClient/main.cpp
@@
-39,9
+39,9
@@
public:
a_txMessageCounter (0)
{;}
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;
private:
int a_messageBySecond;
@@
-50,7
+50,7
@@
private:
int a_txMessageCounter;
ThreadData <test::Request> a_requests;
int a_txMessageCounter;
ThreadData <test::Request> a_requests;
- bool tick ()
throw (RuntimeException
);
+ bool tick ()
noexcept(false
);
};
class MyCommunicator : public Communicator {
};
class MyCommunicator : public Communicator {
@@
-58,29
+58,31
@@
public:
MyCommunicator () : Communicator (), a_avgResponseTime (0), a_rxMessageCounter (0), a_responses ("Response") {;}
private:
MyCommunicator () : Communicator (), a_avgResponseTime (0), a_rxMessageCounter (0), a_responses ("Response") {;}
private:
+ using Communicator::eventBreakConnection;
+
ThreadData <test::Response> a_responses;
int a_avgResponseTime;
int a_rxMessageCounter;
ThreadData <test::Response> a_responses;
int a_avgResponseTime;
int a_rxMessageCounter;
- void eventReceiveMessage (ClientSocket &, const Message&)
throw (RuntimeException
);
+ void eventReceiveMessage (ClientSocket &, const Message&)
noexcept(false
);
/*
/*
- void eventBreakConnection (const ClientSocket&)
throw ()
;
+ void eventBreakConnection (const ClientSocket&) ;
- void eventBreakConnection (Server* server)
throw ()
{
+ void eventBreakConnection (Server* server) {
comm::Communicator::eventBreakConnection (server);
}
*/
comm::Communicator::eventBreakConnection (server);
}
*/
- void eventBreakConnection (const Service* service)
throw ()
;
+ void eventBreakConnection (const Service* service) ;
- static bool isOk (const test::Response& response)
throw ()
;
+ static bool isOk (const test::Response& response) ;
};
class RRClient : public anna::comm::Application {
public:
RRClient ();
};
class RRClient : public anna::comm::Application {
public:
RRClient ();
- Service* getService () const
throw ()
{ return a_service; }
- const Sender* getSender () const
throw ()
{ return &a_sender; }
+ Service* getService () const { return a_service; }
+ const Sender* getSender () const { return &a_sender; }
private:
MyCommunicator a_communicator;
private:
MyCommunicator a_communicator;
@@
-88,8
+90,8
@@
private:
Sender a_sender;
Service* a_service;
Sender a_sender;
Service* a_service;
- void initialize ()
throw (RuntimeException
);
- void run ()
throw (RuntimeException
);
+ void initialize ()
noexcept(false
);
+ void run ()
noexcept(false
);
};
using namespace std;
};
using namespace std;
@@
-134,7
+136,7
@@
RRClient::RRClient () :
}
void RRClient::initialize ()
}
void RRClient::initialize ()
-
throw (RuntimeException
)
+
noexcept(false
)
{
CommandLine& cl (CommandLine::instantiate ());
{
CommandLine& cl (CommandLine::instantiate ());
@@
-158,7
+160,7
@@
void RRClient::initialize ()
}
void RRClient::run ()
}
void RRClient::run ()
-
throw (RuntimeException
)
+
noexcept(false
)
{
a_timeController.activate (a_sender);
{
a_timeController.activate (a_sender);
@@
-166,7
+168,7
@@
void RRClient::run ()
}
void MyCommunicator::eventReceiveMessage (ClientSocket&, const Message& message)
}
void MyCommunicator::eventReceiveMessage (ClientSocket&, const Message& message)
-
throw (RuntimeException
)
+
noexcept(false
)
{
LOGMETHOD (TraceMethod tm ("MyCommunicator", "eventReceiveMessage", ANNA_FILE_LOCATION));
{
LOGMETHOD (TraceMethod tm ("MyCommunicator", "eventReceiveMessage", ANNA_FILE_LOCATION));
@@
-201,7
+203,7
@@
void MyCommunicator::eventReceiveMessage (ClientSocket&, const Message& message)
}
void MyCommunicator::eventBreakConnection (const Service* service)
}
void MyCommunicator::eventBreakConnection (const Service* service)
- throw ()
+
{
LOGMETHOD (TraceMethod tm ("MyCommunicator", "eventBreakConnection", ANNA_FILE_LOCATION));
{
LOGMETHOD (TraceMethod tm ("MyCommunicator", "eventBreakConnection", ANNA_FILE_LOCATION));
@@
-230,7
+232,7
@@
void MyCommunicator::eventBreakConnection (const Service* service)
}
bool MyCommunicator::isOk (const test::Response& response)
}
bool MyCommunicator::isOk (const test::Response& response)
- throw ()
+
{
if (response.op != '+' && response.op != '-' && response.op != '*' && response.op != '/')
return false;
{
if (response.op != '+' && response.op != '-' && response.op != '*' && response.op != '/')
return false;
@@
-256,7
+258,7
@@
bool MyCommunicator::isOk (const test::Response& response)
}
bool Sender::tick ()
}
bool Sender::tick ()
-
throw (RuntimeException
)
+
noexcept(false
)
{
LOGMETHOD (TraceMethod tm (Logger::Local7, "Sender", "tick", ANNA_FILE_LOCATION));
{
LOGMETHOD (TraceMethod tm (Logger::Local7, "Sender", "tick", ANNA_FILE_LOCATION));