diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2009-08-07 18:01:43 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2009-08-07 18:01:43 +0800 |
| commit | 5c9e6e5d3d1873ea232bf05ed2f6be8d290c8583 (patch) | |
| tree | 66b739dff9ee9cbdc113a158c30ef80ae84ac218 /cpp/src/Ice/CommunicatorI.cpp | |
| parent | Revert "Changes for bug 3962 and 4714" (diff) | |
| download | ice-5c9e6e5d3d1873ea232bf05ed2f6be8d290c8583.tar.bz2 ice-5c9e6e5d3d1873ea232bf05ed2f6be8d290c8583.tar.xz ice-5c9e6e5d3d1873ea232bf05ed2f6be8d290c8583.zip | |
merged in both of Jose's 4071 fixes.
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 cc61ce97c52..86e1fc4fba1 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -35,6 +35,9 @@ IceUtil::Handle<IceInternal::GC> theCollector = 0; } +namespace +{ + struct GarbageCollectorStats { GarbageCollectorStats() : @@ -47,9 +50,6 @@ struct GarbageCollectorStats IceUtil::Time time; }; -namespace -{ - int communicatorCount = 0; IceUtil::Mutex* gcMutex = 0; GarbageCollectorStats gcStats; @@ -77,9 +77,7 @@ public: Init init; -} - -static void +void printGCStats(const IceInternal::GCStats& stats) { if(gcTraceLevel) @@ -96,6 +94,8 @@ printGCStats(const IceInternal::GCStats& stats) } } +} + void Ice::CommunicatorI::destroy() { |