diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2009-08-07 11:10:37 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2009-08-07 11:10:37 +0800 |
| commit | 3af793bd59430b2adaa2f89d8867f46010dd0080 (patch) | |
| tree | 95d538d5a6c2f74210d2ed2d34d147dcbbb8a733 /cpp/src/Ice/ConnectionFactory.cpp | |
| parent | Revert "4071 - Global namespace pollution" (diff) | |
| download | ice-3af793bd59430b2adaa2f89d8867f46010dd0080.tar.bz2 ice-3af793bd59430b2adaa2f89d8867f46010dd0080.tar.xz ice-3af793bd59430b2adaa2f89d8867f46010dd0080.zip | |
Revert "4171 - Global namespace pollution"
This reverts commit 2f63dafe080ad36656d23bfe9c581e45d714be18.
Diffstat (limited to 'cpp/src/Ice/ConnectionFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionFactory.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 84de59104d2..ecce6f07866 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -1345,9 +1345,6 @@ IceInternal::IncomingConnectionFactory::read(BasicStream&) return false; } -namespace IceInternal -{ - class PromoteFollower { public: @@ -1367,8 +1364,6 @@ private: const ThreadPoolPtr _threadPool; }; -} - void IceInternal::IncomingConnectionFactory::message(BasicStream&, const ThreadPoolPtr& threadPool) { @@ -1385,7 +1380,7 @@ IceInternal::IncomingConnectionFactory::message(BasicStream&, const ThreadPoolPt // If _threadPool is null, then this class doesn't do // anything. // - IceInternal::PromoteFollower promote(threadPool); + PromoteFollower promote(threadPool); if(_state != StateActive) { |