diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2009-08-07 11:10:23 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2009-08-07 11:10:23 +0800 |
| commit | 8981bc21c09116fee00bce21fb94a3298c7d8589 (patch) | |
| tree | 4c1db6f731916f0e11f4c84a8233d397a8836008 /cpp/src/Ice/ConnectionFactory.cpp | |
| parent | bug 4073 - Freeze.jar not mentioned in CHANGES (diff) | |
| download | ice-8981bc21c09116fee00bce21fb94a3298c7d8589.tar.bz2 ice-8981bc21c09116fee00bce21fb94a3298c7d8589.tar.xz ice-8981bc21c09116fee00bce21fb94a3298c7d8589.zip | |
Revert "4071 - Global namespace pollution"
This reverts commit 3fd8c6939b3f79cdb202af3305ea6acc377e247d.
Diffstat (limited to 'cpp/src/Ice/ConnectionFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionFactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 32de59ba16e..84de59104d2 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -1345,7 +1345,7 @@ IceInternal::IncomingConnectionFactory::read(BasicStream&) return false; } -namespace +namespace IceInternal { class PromoteFollower @@ -1385,7 +1385,7 @@ IceInternal::IncomingConnectionFactory::message(BasicStream&, const ThreadPoolPt // If _threadPool is null, then this class doesn't do // anything. // - PromoteFollower promote(threadPool); + IceInternal::PromoteFollower promote(threadPool); if(_state != StateActive) { |