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/SliceChecksums.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/SliceChecksums.cpp')
| -rw-r--r-- | cpp/src/Ice/SliceChecksums.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cpp/src/Ice/SliceChecksums.cpp b/cpp/src/Ice/SliceChecksums.cpp index 5e5b9f5fd73..122d01a4be9 100644 --- a/cpp/src/Ice/SliceChecksums.cpp +++ b/cpp/src/Ice/SliceChecksums.cpp @@ -14,10 +14,11 @@ using namespace std; using namespace Ice; -static SliceChecksumDict* _sliceChecksums = 0; namespace { +SliceChecksumDict* _sliceChecksums = 0; + IceUtil::Mutex* _mutex = 0; class Init @@ -38,8 +39,6 @@ public: Init init; -} - class SliceChecksumDictDestroyer { public: @@ -50,7 +49,10 @@ public: _sliceChecksums = 0; } }; -static SliceChecksumDictDestroyer destroyer; + +SliceChecksumDictDestroyer destroyer; + +} SliceChecksumDict Ice::sliceChecksums() |