summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/SliceChecksums.cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2009-08-07 11:10:23 +0800
committerMatthew Newhook <matthew@zeroc.com>2009-08-07 11:10:23 +0800
commit8981bc21c09116fee00bce21fb94a3298c7d8589 (patch)
tree4c1db6f731916f0e11f4c84a8233d397a8836008 /cpp/src/Ice/SliceChecksums.cpp
parentbug 4073 - Freeze.jar not mentioned in CHANGES (diff)
downloadice-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/SliceChecksums.cpp')
-rw-r--r--cpp/src/Ice/SliceChecksums.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/cpp/src/Ice/SliceChecksums.cpp b/cpp/src/Ice/SliceChecksums.cpp
index 122d01a4be9..5e5b9f5fd73 100644
--- a/cpp/src/Ice/SliceChecksums.cpp
+++ b/cpp/src/Ice/SliceChecksums.cpp
@@ -14,11 +14,10 @@
using namespace std;
using namespace Ice;
+static SliceChecksumDict* _sliceChecksums = 0;
namespace
{
-SliceChecksumDict* _sliceChecksums = 0;
-
IceUtil::Mutex* _mutex = 0;
class Init
@@ -39,6 +38,8 @@ public:
Init init;
+}
+
class SliceChecksumDictDestroyer
{
public:
@@ -49,10 +50,7 @@ public:
_sliceChecksums = 0;
}
};
-
-SliceChecksumDictDestroyer destroyer;
-
-}
+static SliceChecksumDictDestroyer destroyer;
SliceChecksumDict
Ice::sliceChecksums()