summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionFactory.cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2009-08-07 18:01:43 +0800
committerMatthew Newhook <matthew@zeroc.com>2009-08-07 18:01:43 +0800
commit5c9e6e5d3d1873ea232bf05ed2f6be8d290c8583 (patch)
tree66b739dff9ee9cbdc113a158c30ef80ae84ac218 /cpp/src/Ice/ConnectionFactory.cpp
parentRevert "Changes for bug 3962 and 4714" (diff)
downloadice-5c9e6e5d3d1873ea232bf05ed2f6be8d290c8583.tar.bz2
ice-5c9e6e5d3d1873ea232bf05ed2f6be8d290c8583.tar.xz
ice-5c9e6e5d3d1873ea232bf05ed2f6be8d290c8583.zip
merged in both of Jose's 4071 fixes.
Diffstat (limited to 'cpp/src/Ice/ConnectionFactory.cpp')
-rw-r--r--cpp/src/Ice/ConnectionFactory.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index ecce6f07866..32de59ba16e 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -1345,6 +1345,9 @@ IceInternal::IncomingConnectionFactory::read(BasicStream&)
return false;
}
+namespace
+{
+
class PromoteFollower
{
public:
@@ -1364,6 +1367,8 @@ private:
const ThreadPoolPtr _threadPool;
};
+}
+
void
IceInternal::IncomingConnectionFactory::message(BasicStream&, const ThreadPoolPtr& threadPool)
{