X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=source%2Fcomm%2FNetwork.cpp;fp=source%2Fcomm%2FNetwork.cpp;h=0a08f5be536ecc48cf38d0b296166641d50df3df;hp=709cc771faf65731a5162b4d23856fd9a8587280;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hpb=af9c86ffb0e28d35ad94d99c5f77e41578c972b4 diff --git a/source/comm/Network.cpp b/source/comm/Network.cpp index 709cc77..0a08f5b 100644 --- a/source/comm/Network.cpp +++ b/source/comm/Network.cpp @@ -23,7 +23,7 @@ using namespace std; using namespace anna; comm::Device* comm::Network::find(const in_addr_t& address) -throw() { +{ Device* result = NULL; if(a_cacheDevice != NULL && *a_cacheDevice == address) @@ -41,7 +41,7 @@ throw() { } comm::Host* comm::Network::find_host(const char* name) -throw() { +{ Host* result = NULL; if(a_cacheHost != NULL && anna_strcmp(a_cacheHost->getName().c_str(), name) == 0) @@ -59,7 +59,7 @@ throw() { } comm::Host* comm::Network::resolve(const char* hostname) -throw(RuntimeException) { +noexcept(false) { comm::Host* result = find_host(hostname); struct hostent *host; @@ -95,7 +95,7 @@ throw(RuntimeException) { comm::Server* comm::Network::createServer(const char* ip, const int remotePort, const bool autoRecovery, comm::TransportFactory* transportFactory, const Port::_v mode, const DoConnect::_v doConnect) -throw(RuntimeException) { +noexcept(false) { comm::Server* result(NULL); comm::Host* host = find_host(ip); Guard guard(host, "comm::Host from comm::Network::createServer"); @@ -116,14 +116,14 @@ throw(RuntimeException) { } comm::Server* comm::Network::createServer(const char* ip, const int remotePort, const bool autoRecovery, comm::ReceiverFactory& rrff, comm::TransportFactory* transportFactory, const Port::_v mode, const DoConnect::_v doConnect) -throw(RuntimeException) { +noexcept(false) { Server* result = createServer(ip, remotePort, autoRecovery, transportFactory, mode, doConnect); result->setReceiverFactory(rrff); return result; } //comm::Server* comm::Network::findServer (const char* ip, const int remotePort) -// throw (RuntimeException) +// noexcept(false) //{ // comm::Host* _host (NULL); // @@ -139,7 +139,7 @@ throw(RuntimeException) { comm::Server* comm::Network::resolveServer(const char* hostname, const int remotePort, const bool autoRecovery, comm::TransportFactory* transportFactory, const Port::_v mode, const DoConnect::_v doConnect) -throw(RuntimeException) { +noexcept(false) { comm::Server* result(NULL); comm::Host* host = resolve(hostname); Guard guard(host, "comm::Host from comm::Network::resolveServer"); @@ -158,26 +158,26 @@ throw(RuntimeException) { } comm::Server* comm::Network::resolveServer(const char* hostname, const int remotePort, const bool autoRecovery, comm::ReceiverFactory& rrff, comm::TransportFactory* transportFactory, const Port::_v mode, const DoConnect::_v doConnect) -throw(RuntimeException) { +noexcept(false) { Server* result = resolveServer(hostname, remotePort, autoRecovery, transportFactory, mode, doConnect); result->setReceiverFactory(rrff); return result; } comm::INetAddress comm::Network::getINetAddress(const char* ip, const int port) -throw(RuntimeException) { +noexcept(false) { const Device* device = find(Device::asAddress(ip)); return INetAddress(device, port); } comm::INetAddress comm::Network::getINetAddress(const std::string& ip, const int port) -throw(RuntimeException) { +noexcept(false) { const Device* device = find(Device::asAddress(ip)); return INetAddress(device, port); } xml::Node* comm::Network::asXML(xml::Node* parent) const -throw() { +{ xml::Node* result = parent->createChild("comm.Network"); xml::Node* node = result->createChild("comm.Devices");