summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL/OpenSSLPluginI.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2004-10-13 22:02:29 +0000
committerMarc Laukien <marc@zeroc.com>2004-10-13 22:02:29 +0000
commit0e96db14382d6b91c8863220fa4a089b8ead33d1 (patch)
tree3713029a24d8000e1b3a8146b5db5459501ac209 /cpp/src/IceSSL/OpenSSLPluginI.cpp
parentFixed null subscriber (diff)
downloadice-0e96db14382d6b91c8863220fa4a089b8ead33d1.tar.bz2
ice-0e96db14382d6b91c8863220fa4a089b8ead33d1.tar.xz
ice-0e96db14382d6b91c8863220fa4a089b8ead33d1.zip
fix
Diffstat (limited to 'cpp/src/IceSSL/OpenSSLPluginI.cpp')
-rw-r--r--cpp/src/IceSSL/OpenSSLPluginI.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp
index d9ed1dde76f..0ab35543ea3 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.cpp
+++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp
@@ -7,8 +7,6 @@
//
// **********************************************************************
-#include <IceUtil/Mutex.h>
-
#include <Ice/LoggerUtil.h>
#include <Ice/Properties.h>
#include <Ice/ProtocolPluginFacade.h>
@@ -175,13 +173,6 @@ IceSSL::SslLockKeeper::~SslLockKeeper()
}
//
-// PluginI implementation
-//
-
-IceUtil::StaticMutex IceSSL::OpenSSLPluginI::_threadIdCacheMutex = ICE_STATIC_MUTEX_INITIALIZER;
-std::vector<unsigned long> IceSSL::OpenSSLPluginI::_threadIdCache;
-
-//
// Public Methods
//
//
@@ -900,7 +891,7 @@ IceSSL::OpenSSLPluginI::registerThread()
{
unsigned long threadID = idFunction();
- IceUtil::StaticMutex::Lock sync(_threadIdCacheMutex);
+ IceUtil::Mutex::Lock sync(_threadIdCacheMutex);
if(find(_threadIdCache.begin(), _threadIdCache.end(), threadID) == _threadIdCache.end())
{
@@ -911,7 +902,7 @@ IceSSL::OpenSSLPluginI::registerThread()
void
IceSSL::OpenSSLPluginI::unregisterThreads()
{
- IceUtil::StaticMutex::Lock sync(_threadIdCacheMutex);
+ IceUtil::Mutex::Lock sync(_threadIdCacheMutex);
for_each(_threadIdCache.begin(), _threadIdCache.end(), ERR_remove_state);
}