summaryrefslogtreecommitdiff
path: root/cpp/include/Ice/FactoryTableDef.h
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2003-05-09 19:58:42 +0000
committerBernard Normier <bernard@zeroc.com>2003-05-09 19:58:42 +0000
commit576c135ffea8e4e2ac6c45620d66bf8fcd615601 (patch)
tree34799f3700070d726058090290eb2dcee0e85ee3 /cpp/include/Ice/FactoryTableDef.h
parentshutdownOnInterrupt is now the default (diff)
downloadice-576c135ffea8e4e2ac6c45620d66bf8fcd615601.tar.bz2
ice-576c135ffea8e4e2ac6c45620d66bf8fcd615601.tar.xz
ice-576c135ffea8e4e2ac6c45620d66bf8fcd615601.zip
Changed library names on Windows for Ice 1.1
Diffstat (limited to 'cpp/include/Ice/FactoryTableDef.h')
-rw-r--r--cpp/include/Ice/FactoryTableDef.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/include/Ice/FactoryTableDef.h b/cpp/include/Ice/FactoryTableDef.h
index fd27df7f8f4..9cccab25945 100644
--- a/cpp/include/Ice/FactoryTableDef.h
+++ b/cpp/include/Ice/FactoryTableDef.h
@@ -15,7 +15,8 @@
#ifndef ICE_FACTORYTABLEDEF_H
#define ICE_FACTORYTABLEDEF_H
-#include <IceUtil/StaticMutex.h>
+#include <IceUtil/StaticMutex.h>
+#include <IceUtil/Mutex.h>
#include <Ice/UserExceptionFactory.h>
#include <Ice/ObjectFactory.h>
#include <string>
@@ -38,7 +39,7 @@ public:
private:
- IceUtil::StaticMutex _m;
+ IceUtil::Mutex _m;
typedef ::std::pair<Ice::UserExceptionFactoryPtr, int> EFPair;
typedef ::std::map< ::std::string, EFPair> EFTable;
@@ -62,7 +63,7 @@ private:
void initialize();
void finalize();
- IceUtil::StaticMutex _m;
+ static IceUtil::StaticMutex _m;
static int _initCount;
};