diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-12-11 06:13:02 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-12-11 06:13:02 +0000 |
commit | 36adc76235fb0a38e7042bc751f988b71627e2a0 (patch) | |
tree | fc83b3f4e0afeb3932c8d200f5493f0a8d6c4619 /sca-cpp/trunk/patches/thrift-0.8.0.patch | |
parent | 86b1de85536e93c59a25702a5a2d3e384202ffd2 (diff) |
Changes to get successful C++11 based build. Code cleanup, dependency upgrades, and const + inline optimizations in components, samples, and app hosting server.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1420007 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/patches/thrift-0.8.0.patch')
-rw-r--r-- | sca-cpp/trunk/patches/thrift-0.8.0.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/sca-cpp/trunk/patches/thrift-0.8.0.patch b/sca-cpp/trunk/patches/thrift-0.8.0.patch new file mode 100644 index 0000000000..09b4412c3a --- /dev/null +++ b/sca-cpp/trunk/patches/thrift-0.8.0.patch @@ -0,0 +1,41 @@ +--- lib/cpp/src/server/TNonblockingServer.cpp ++++ lib/cpp/src/server/TNonblockingServer.cpp +@@ -989,8 +989,8 @@ + hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; + sprintf(port, "%d", port_); + +- // Wildcard address +- error = getaddrinfo(NULL, port, &hints, &res0); ++ // Wildcard or specified address ++ error = getaddrinfo(host_ == "" || host_ =="*"? NULL : host_.c_str(), port, &hints, &res0); + if (error) { + string errStr = "TNonblockingServer::serve() getaddrinfo " + string(gai_strerror(error)); + GlobalOutput(errStr.c_str()); + +--- lib/cpp/src/server/TNonblockingServer.h ++++ lib/cpp/src/server/TNonblockingServer.h +@@ -126,6 +126,9 @@ + /// Server socket file descriptor + int serverSocket_; + ++ /// Host server runs on ++ std::string host_; ++ + /// Port server runs on + int port_; + +@@ -294,11 +297,13 @@ + TNonblockingServer( + const boost::shared_ptr<Processor>& processor, + const boost::shared_ptr<TProtocolFactory>& protocolFactory, ++ const std::string host, + int port, + const boost::shared_ptr<ThreadManager>& threadManager = + boost::shared_ptr<ThreadManager>(), + THRIFT_OVERLOAD_IF(Processor, TProcessor)) : +- TServer(processor) { ++ TServer(processor), ++ host_(host) { + + init(port); + |