From 7354713433de7a337ca2c98f4298b47b60c9c560 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Mon, 18 Feb 2013 14:31:27 -0600 Subject: [PATCH] GH #93: ParallelSocketAcceptor virtual functions - fixed GH #93: ParallelSocketAcceptor virtual functions - updated CHANGELOG --- Net/include/Poco/Net/ParallelSocketAcceptor.h | 8 ++++---- Net/include/Poco/Net/SocketAcceptor.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Net/include/Poco/Net/ParallelSocketAcceptor.h b/Net/include/Poco/Net/ParallelSocketAcceptor.h index 75a91a3d9..333cbe777 100644 --- a/Net/include/Poco/Net/ParallelSocketAcceptor.h +++ b/Net/include/Poco/Net/ParallelSocketAcceptor.h @@ -104,13 +104,13 @@ public: registerAcceptor(reactor); } - ~ParallelSocketAcceptor() + virtual ~ParallelSocketAcceptor() /// Destroys the ParallelSocketAcceptor. { unregisterAcceptor(); } - void registerAcceptor(SocketReactor& reactor) + virtual void registerAcceptor(SocketReactor& reactor) /// Registers the ParallelSocketAcceptor with a SocketReactor. /// /// A subclass can override this and, for example, also register @@ -124,7 +124,7 @@ public: ReadableNotification>(*this, &ParallelSocketAcceptor::onAccept)); } - void unregisterAcceptor() + virtual void unregisterAcceptor() /// Unregisters the ParallelSocketAcceptor. /// /// A subclass can override this and, for example, also unregister @@ -146,7 +146,7 @@ public: } protected: - ServiceHandler* createServiceHandler(StreamSocket& socket) + virtual ServiceHandler* createServiceHandler(StreamSocket& socket) /// Create and initialize a new ServiceHandler instance. /// /// Subclasses can override this method. diff --git a/Net/include/Poco/Net/SocketAcceptor.h b/Net/include/Poco/Net/SocketAcceptor.h index 5fb7ff9c6..c899fa6fb 100644 --- a/Net/include/Poco/Net/SocketAcceptor.h +++ b/Net/include/Poco/Net/SocketAcceptor.h @@ -88,7 +88,7 @@ class SocketAcceptor /// Subclasses can override the createServiceHandler() factory method /// if special steps are necessary to create a ServiceHandler object. { -public: +public: explicit SocketAcceptor(ServerSocket& socket): _socket(socket), _pReactor(0)