From 184d3698c99c41d8c51477a50436134c6951a9fa Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 9 Aug 2018 19:38:33 +0200 Subject: [PATCH] Fixed: Warnings, throw(type) deprecated in C++11 and removed in C++17 --HG-- branch : develop --- code/nel/include/nel/net/module.h | 15 ++++----------- code/nel/include/nel/net/module_socket.h | 22 ++++++---------------- code/nel/src/net/module.cpp | 1 - code/nel/src/net/module_gateway.cpp | 3 +-- code/nel/src/net/module_local_gateway.cpp | 4 +--- 5 files changed, 12 insertions(+), 33 deletions(-) diff --git a/code/nel/include/nel/net/module.h b/code/nel/include/nel/net/module.h index 05cd48fed..803fe458c 100644 --- a/code/nel/include/nel/net/module.h +++ b/code/nel/include/nel/net/module.h @@ -213,18 +213,14 @@ namespace NLNET * Note that a module can be plugged in several socket at the same * time, but not twice in the same socket. */ - virtual void plugModule(IModuleSocket *moduleSocket) - throw (EModuleAlreadyPluggedHere) - =0; + virtual void plugModule(IModuleSocket *moduleSocket) =0; /** Unplug this module from the specified socket. * Note that a module can be plugged in several socket at the same * time, but not twice in the same socket. * Throw an exception if the socket is not currently plug into * the specified socket. */ - virtual void unplugModule(IModuleSocket *moduleSocket) - throw (EModuleNotPluggedHere) - =0; + virtual void unplugModule(IModuleSocket *moduleSocket) =0; /** Fill resultList vector with the list of socket into * witch this module is currently plugged. * This method don't clear the result vector before filling it. @@ -448,9 +444,7 @@ namespace NLNET * This method do the job of finding a valid socket to effectively send * the message. */ - virtual void sendModuleMessage(IModule *senderModule, const NLNET::CMessage &message) - throw (EModuleNotReachable) - =0; + virtual void sendModuleMessage(IModule *senderModule, const NLNET::CMessage &message) =0; /** Return the first item of the security item list * If no security data are available, the method @@ -879,8 +873,7 @@ namespace NLNET /** Send a message to the module. */ - virtual void sendModuleMessage(IModule *senderModule, const NLNET::CMessage &message) - throw (EModuleNotReachable); + virtual void sendModuleMessage(IModule *senderModule, const NLNET::CMessage &message); virtual const TSecurityData *getFirstSecurityData() const { diff --git a/code/nel/include/nel/net/module_socket.h b/code/nel/include/nel/net/module_socket.h index f4bad56d4..a60836656 100644 --- a/code/nel/include/nel/net/module_socket.h +++ b/code/nel/include/nel/net/module_socket.h @@ -42,15 +42,11 @@ namespace NLNET * If the destination module is not accessible through this socket, * an exception is thrown. */ - virtual void sendModuleMessage(IModule *senderModule, TModuleId destModuleProxyId, const NLNET::CMessage &message ) - throw (EModuleNotPluggedHere) - =0; + virtual void sendModuleMessage(IModule *senderModule, TModuleId destModuleProxyId, const NLNET::CMessage &message) =0; /** A plugged module send a message to all the module reachable * with this socket. */ - virtual void broadcastModuleMessage(IModule *senderModule, const NLNET::CMessage &message) - throw (EModuleNotPluggedHere) - =0; + virtual void broadcastModuleMessage(IModule *senderModule, const NLNET::CMessage &message) =0; /** Fill the resultList with the list of module that are * reachable with this socket. @@ -95,21 +91,15 @@ namespace NLNET virtual void _onModulePlugged(const TModulePtr &pluggedModule); virtual void _onModuleUnplugged(const TModulePtr &pluggedModule); - virtual void _sendModuleMessage(IModule *senderModule, TModuleId destModuleProxyId, const NLNET::CMessage &message ) - throw (EModuleNotPluggedHere, NLNET::EModuleNotReachable) - =0; + virtual void _sendModuleMessage(IModule *senderModule, TModuleId destModuleProxyId, const NLNET::CMessage &message) =0; - virtual void _broadcastModuleMessage(IModule *senderModule, const NLNET::CMessage &message) - throw (EModuleNotPluggedHere) - =0; + virtual void _broadcastModuleMessage(IModule *senderModule, const NLNET::CMessage &message) =0; - virtual void sendModuleMessage(IModule *senderModule, TModuleId destModuleProxyId, const NLNET::CMessage &message ) - throw (EModuleNotPluggedHere); + virtual void sendModuleMessage(IModule *senderModule, TModuleId destModuleProxyId, const NLNET::CMessage &message); /** A plugged module send a message to all the module reachable * with this socket. */ - virtual void broadcastModuleMessage(IModule *senderModule, const NLNET::CMessage &message) - throw (EModuleNotPluggedHere); + virtual void broadcastModuleMessage(IModule *senderModule, const NLNET::CMessage &message); }; diff --git a/code/nel/src/net/module.cpp b/code/nel/src/net/module.cpp index b5707fea3..23f618973 100644 --- a/code/nel/src/net/module.cpp +++ b/code/nel/src/net/module.cpp @@ -867,7 +867,6 @@ namespace NLNET } void CModuleProxy::sendModuleMessage(IModule *senderModule, const NLNET::CMessage &message) - throw (EModuleNotReachable) { H_AUTO(CModuleProxy_sendModuleMessage); diff --git a/code/nel/src/net/module_gateway.cpp b/code/nel/src/net/module_gateway.cpp index 81ba76859..0acb4375d 100644 --- a/code/nel/src/net/module_gateway.cpp +++ b/code/nel/src/net/module_gateway.cpp @@ -1560,8 +1560,7 @@ namespace NLNET return getModuleName(); } - void _sendModuleMessage(IModule *senderModule, TModuleId destModuleProxyId, const NLNET::CMessage &message ) - throw (EModuleNotReachable, EModuleNotPluggedHere) + void _sendModuleMessage(IModule *senderModule, TModuleId destModuleProxyId, const NLNET::CMessage &message) { // the socket implementation already checked that the module is plugged here // just check that the destination module effectively from here diff --git a/code/nel/src/net/module_local_gateway.cpp b/code/nel/src/net/module_local_gateway.cpp index 3446c0663..292a6cafe 100644 --- a/code/nel/src/net/module_local_gateway.cpp +++ b/code/nel/src/net/module_local_gateway.cpp @@ -364,8 +364,7 @@ namespace NLNET return getModuleName(); } - void _sendModuleMessage(IModule *senderModule, TModuleId destModuleProxyId, const NLNET::CMessage &message ) - throw (EModuleNotReachable, EModuleNotPluggedHere) + void _sendModuleMessage(IModule *senderModule, TModuleId destModuleProxyId, const NLNET::CMessage &message) { TModuleProxies::TAToBMap::const_iterator first(_ModuleProxies.getAToBMap().begin()), last(_ModuleProxies.getAToBMap().end()); for (; first != last && first->first->getModuleProxyId() != destModuleProxyId; ++first) {} @@ -373,7 +372,6 @@ namespace NLNET throw EModuleNotReachable(); } virtual void _broadcastModuleMessage(IModule * /* senderModule */, const NLNET::CMessage &/* message */) - throw (EModuleNotPluggedHere) { nlstop; }