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/CommunicatorI.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/CommunicatorI.cpp')
| -rw-r--r-- | cpp/src/Ice/CommunicatorI.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index 86e1fc4fba1..cc61ce97c52 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -35,9 +35,6 @@ IceUtil::Handle<IceInternal::GC> theCollector = 0; } -namespace -{ - struct GarbageCollectorStats { GarbageCollectorStats() : @@ -50,6 +47,9 @@ struct GarbageCollectorStats IceUtil::Time time; }; +namespace +{ + int communicatorCount = 0; IceUtil::Mutex* gcMutex = 0; GarbageCollectorStats gcStats; @@ -77,7 +77,9 @@ public: Init init; -void +} + +static void printGCStats(const IceInternal::GCStats& stats) { if(gcTraceLevel) @@ -94,8 +96,6 @@ printGCStats(const IceInternal::GCStats& stats) } } -} - void Ice::CommunicatorI::destroy() { |