Author: roger
Date: Mon Jun 18 20:02:36 2012
New Revision: 1351472
URL: http://svn.apache.org/viewvc?rev=1351472&view=rev
Log:
THRIFT-1631 Fix C++ server constructor typos
Patch: Andrew Cox
THRIFT-1573 Error on TNonblockingServer constructor
Patch: Denis
Modified:
thrift/trunk/lib/cpp/src/thrift/server/TServer.h
thrift/trunk/lib/cpp/src/thrift/server/TThreadPoolServer.h
thrift/trunk/lib/cpp/src/thrift/server/TThreadedServer.h
Modified: thrift/trunk/lib/cpp/src/thrift/server/TServer.h
URL:
http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/thrift/server/TServer.h?rev=1351472&r1=1351471&r2=1351472&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/thrift/server/TServer.h (original)
+++ thrift/trunk/lib/cpp/src/thrift/server/TServer.h Mon Jun 18 20:02:36 2012
@@ -142,7 +142,7 @@ class TServer : public concurrency::Runn
protected:
template<typename ProcessorFactory>
- TServer(const boost::shared_ptr<TProcessorFactory>& processorFactory,
+ TServer(const boost::shared_ptr<ProcessorFactory>& processorFactory,
THRIFT_OVERLOAD_IF(ProcessorFactory, TProcessorFactory)):
processorFactory_(processorFactory) {
setInputTransportFactory(boost::shared_ptr<TTransportFactory>(
@@ -166,7 +166,7 @@ protected:
}
template<typename ProcessorFactory>
- TServer(const boost::shared_ptr<TProcessorFactory>& processorFactory,
+ TServer(const boost::shared_ptr<ProcessorFactory>& processorFactory,
const boost::shared_ptr<TServerTransport>& serverTransport,
THRIFT_OVERLOAD_IF(ProcessorFactory, TProcessorFactory)):
processorFactory_(processorFactory),
Modified: thrift/trunk/lib/cpp/src/thrift/server/TThreadPoolServer.h
URL:
http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/thrift/server/TThreadPoolServer.h?rev=1351472&r1=1351471&r2=1351472&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/thrift/server/TThreadPoolServer.h (original)
+++ thrift/trunk/lib/cpp/src/thrift/server/TThreadPoolServer.h Mon Jun 18
20:02:36 2012
@@ -44,7 +44,7 @@ class TThreadPoolServer : public TServer
const boost::shared_ptr<TTransportFactory>& transportFactory,
const boost::shared_ptr<TProtocolFactory>& protocolFactory,
const boost::shared_ptr<ThreadManager>& threadManager,
- THRIFT_OVERLOAD_IF(ProcessorFactory, TProtocolFactory)) :
+ THRIFT_OVERLOAD_IF(ProcessorFactory, TProcessorFactory)) :
TServer(processorFactory, serverTransport, transportFactory,
protocolFactory),
threadManager_(threadManager),
Modified: thrift/trunk/lib/cpp/src/thrift/server/TThreadedServer.h
URL:
http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/thrift/server/TThreadedServer.h?rev=1351472&r1=1351471&r2=1351472&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/thrift/server/TThreadedServer.h (original)
+++ thrift/trunk/lib/cpp/src/thrift/server/TThreadedServer.h Mon Jun 18
20:02:36 2012
@@ -53,7 +53,7 @@ class TThreadedServer : public TServer {
const boost::shared_ptr<TTransportFactory>& transportFactory,
const boost::shared_ptr<TProtocolFactory>& protocolFactory,
const boost::shared_ptr<ThreadFactory>& threadFactory,
- THRIFT_OVERLOAD_IF(ProcessorFactory, TProtocolFactory));
+ THRIFT_OVERLOAD_IF(ProcessorFactory, TProcessorFactory));
template<typename Processor>
TThreadedServer(const boost::shared_ptr<Processor>& processor,
@@ -109,7 +109,7 @@ TThreadedServer::TThreadedServer(
const boost::shared_ptr<TTransportFactory>& transportFactory,
const boost::shared_ptr<TProtocolFactory>& protocolFactory,
const boost::shared_ptr<ThreadFactory>& threadFactory,
- THRIFT_OVERLOAD_IF_DEFN(ProcessorFactory, TProtocolFactory)) :
+ THRIFT_OVERLOAD_IF_DEFN(ProcessorFactory, TProcessorFactory)) :
TServer(processorFactory, serverTransport, transportFactory,
protocolFactory),
threadFactory_(threadFactory) {
