THRIFT-1631 Fix C++ server constructor typos
Patch: Andrew Cox
THRIFT-1573 Error on TNonblockingServer constructor
Patch: Denis
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1351472 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/src/thrift/server/TServer.h b/lib/cpp/src/thrift/server/TServer.h
index f172ad1..c9e88b1 100644
--- a/lib/cpp/src/thrift/server/TServer.h
+++ b/lib/cpp/src/thrift/server/TServer.h
@@ -142,7 +142,7 @@
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 @@
}
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),
diff --git a/lib/cpp/src/thrift/server/TThreadPoolServer.h b/lib/cpp/src/thrift/server/TThreadPoolServer.h
index 48a11cb..70b19bb 100644
--- a/lib/cpp/src/thrift/server/TThreadPoolServer.h
+++ b/lib/cpp/src/thrift/server/TThreadPoolServer.h
@@ -44,7 +44,7 @@
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),
diff --git a/lib/cpp/src/thrift/server/TThreadedServer.h b/lib/cpp/src/thrift/server/TThreadedServer.h
index 42faaf0..f965fcd 100644
--- a/lib/cpp/src/thrift/server/TThreadedServer.h
+++ b/lib/cpp/src/thrift/server/TThreadedServer.h
@@ -53,7 +53,7 @@
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 @@
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) {