diff options
| author | Bernard Normier <bernard@zeroc.com> | 2003-09-16 15:13:08 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2003-09-16 15:13:08 +0000 |
| commit | c02b1d6da48ee7cb3e479101145ab2294ac2be50 (patch) | |
| tree | 409728ddf3bdffa9c288d0b30eeb7c5e1d162408 /cpp/src | |
| parent | Fixed warnings (diff) | |
| download | ice-c02b1d6da48ee7cb3e479101145ab2294ac2be50.tar.bz2 ice-c02b1d6da48ee7cb3e479101145ab2294ac2be50.tar.xz ice-c02b1d6da48ee7cb3e479101145ab2294ac2be50.zip | |
Fixed merge problem
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceUtil/StaticMutex.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cpp/src/IceUtil/StaticMutex.cpp b/cpp/src/IceUtil/StaticMutex.cpp index 49b3a9eb78d..33e764e20b6 100644 --- a/cpp/src/IceUtil/StaticMutex.cpp +++ b/cpp/src/IceUtil/StaticMutex.cpp @@ -83,9 +83,6 @@ void IceUtil::StaticMutex::initialize() const EnterCriticalSection(&_criticalSection); if(!_mutexInitialized) { - _mutex = new CRITICAL_SECTION; - InitializeCriticalSection(_mutex); - # if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0400 _mutex = new CRITICAL_SECTION; InitializeCriticalSection(_mutex); |