diff --git a/documentation/pvAccessCPP.html b/documentation/pvAccessCPP.html index 4b08f4b..1d488a4 100644 --- a/documentation/pvAccessCPP.html +++ b/documentation/pvAccessCPP.html @@ -1370,7 +1370,7 @@ class RPCService virtual ~RPCService() {}; virtual PVStructurePtr request( PVStructurePtr const & args - ) throw (RPCRequestException) = 0; + ) = 0; }; diff --git a/src/remote/pv/security.h b/src/remote/pv/security.h index fe3f2be..e65a898 100644 --- a/src/remote/pv/security.h +++ b/src/remote/pv/security.h @@ -138,8 +138,7 @@ namespace epics { virtual void close() = 0; // notification to the client on allowed requests (bitSet, a bit per request) - virtual ChannelSecuritySession::shared_pointer createChannelSession(std::string const & channelName) - throw (SecurityException) = 0; + virtual ChannelSecuritySession::shared_pointer createChannelSession(std::string const & channelName) = 0; }; class epicsShareClass SecurityPluginControl { @@ -197,7 +196,7 @@ namespace epics { virtual SecuritySession::shared_pointer createSession( osiSockAddr const & remoteAddress, SecurityPluginControl::shared_pointer const & control, - epics::pvData::PVField::shared_pointer const & data) throw (SecurityException) = 0; + epics::pvData::PVField::shared_pointer const & data) = 0; }; @@ -240,7 +239,6 @@ namespace epics { // notification to the client on allowed requests (bitSet, a bit per request) virtual ChannelSecuritySession::shared_pointer createChannelSession(std::string const & /*channelName*/) - throw (SecurityException) { return shared_from_this(); } @@ -284,7 +282,7 @@ namespace epics { virtual SecuritySession::shared_pointer createSession( osiSockAddr const & /*remoteAddress*/, SecurityPluginControl::shared_pointer const & control, - epics::pvData::PVField::shared_pointer const & /*data*/) throw (SecurityException) { + epics::pvData::PVField::shared_pointer const & /*data*/) { control->authenticationCompleted(epics::pvData::Status::Ok); return shared_from_this(); } diff --git a/src/rpcService/pv/rpcService.h b/src/rpcService/pv/rpcService.h index c5e890e..1d3bb19 100644 --- a/src/rpcService/pv/rpcService.h +++ b/src/rpcService/pv/rpcService.h @@ -62,7 +62,7 @@ public: virtual epics::pvData::PVStructure::shared_pointer request( epics::pvData::PVStructure::shared_pointer const & args - ) throw (RPCRequestException) = 0; + ) = 0; }; diff --git a/src/server/responseHandlers.cpp b/src/server/responseHandlers.cpp index d094b22..db63b4a 100644 --- a/src/server/responseHandlers.cpp +++ b/src/server/responseHandlers.cpp @@ -509,7 +509,7 @@ public: virtual epics::pvData::PVStructure::shared_pointer request( epics::pvData::PVStructure::shared_pointer const & arguments - ) throw (RPCRequestException) + ) { // NTURI support PVStructure::shared_pointer args( diff --git a/testApp/remote/rpcServiceExample.cpp b/testApp/remote/rpcServiceExample.cpp index 37e87b1..2d564be 100644 --- a/testApp/remote/rpcServiceExample.cpp +++ b/testApp/remote/rpcServiceExample.cpp @@ -24,7 +24,6 @@ class SumServiceImpl : public RPCService { PVStructure::shared_pointer request(PVStructure::shared_pointer const & pvArguments) - throw (RPCRequestException) { // NTURI support PVStructure::shared_pointer args( diff --git a/testApp/remote/rpcWildServiceExample.cpp b/testApp/remote/rpcWildServiceExample.cpp index fa60d49..3e36b58 100644 --- a/testApp/remote/rpcWildServiceExample.cpp +++ b/testApp/remote/rpcWildServiceExample.cpp @@ -19,7 +19,6 @@ class WildServiceImpl : public RPCService { PVStructure::shared_pointer request(PVStructure::shared_pointer const & pvArguments) - throw (RPCRequestException) { // requires NTURI as argument if (pvArguments->getStructure()->getID() != "epics:nt/NTURI:1.0")