diff options
| author | Michi Henning <michi@zeroc.com> | 2005-08-05 05:10:55 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2005-08-05 05:10:55 +0000 |
| commit | 4d1967b5e69ae2a2fe572b9b69ef798a6c364da9 (patch) | |
| tree | 4a97787ec006f73a4080a996b0892a4097aa6366 /cppe/src/IceE/FactoryTableDef.cpp | |
| parent | adding default config (diff) | |
| download | ice-4d1967b5e69ae2a2fe572b9b69ef798a6c364da9.tar.bz2 ice-4d1967b5e69ae2a2fe572b9b69ef798a6c364da9.tar.xz ice-4d1967b5e69ae2a2fe572b9b69ef798a6c364da9.zip | |
Moved FactoryTable into IceInternal namespace.
Diffstat (limited to 'cppe/src/IceE/FactoryTableDef.cpp')
| -rw-r--r-- | cppe/src/IceE/FactoryTableDef.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cppe/src/IceE/FactoryTableDef.cpp b/cppe/src/IceE/FactoryTableDef.cpp index 76c1e7d9a33..25c94f8745f 100644 --- a/cppe/src/IceE/FactoryTableDef.cpp +++ b/cppe/src/IceE/FactoryTableDef.cpp @@ -14,7 +14,7 @@ # include <dlfcn.h> #endif -namespace Ice +namespace IceInternal { FactoryTableWrapper factoryTableWrapper; // Single global instance of the wrapper object that @@ -29,7 +29,7 @@ ICEE_API FactoryTableDef* factoryTable; // Single global instance of the factor // If the factory is present already, increment its reference count. // void -Ice::FactoryTableDef::addExceptionFactory(const std::string& t, const IceInternal::UserExceptionFactoryPtr& f) +IceInternal::FactoryTableDef::addExceptionFactory(const std::string& t, const IceInternal::UserExceptionFactoryPtr& f) { IceUtil::Mutex::Lock lock(_m); EFTable::iterator i = _eft.find(t); @@ -47,7 +47,7 @@ Ice::FactoryTableDef::addExceptionFactory(const std::string& t, const IceInterna // Return the exception factory for a given type ID // IceInternal::UserExceptionFactoryPtr -Ice::FactoryTableDef::getExceptionFactory(const std::string& t) const +IceInternal::FactoryTableDef::getExceptionFactory(const std::string& t) const { IceUtil::Mutex::Lock lock(_m); EFTable::const_iterator i = _eft.find(t); @@ -83,7 +83,7 @@ Ice::FactoryTableDef::getExceptionFactory(const std::string& t) const // entry from the table. // void -Ice::FactoryTableDef::removeExceptionFactory(const std::string& t) +IceInternal::FactoryTableDef::removeExceptionFactory(const std::string& t) { IceUtil::Mutex::Lock lock(_m); EFTable::iterator i = _eft.find(t); @@ -102,12 +102,12 @@ Ice::FactoryTableDef::removeExceptionFactory(const std::string& t) // FactoryTableWrapper. This ensures that the global factoryTable variable is initialized // before it can be used, regardless of the order of initialization of global objects. // -Ice::FactoryTableWrapper::FactoryTableWrapper() +IceInternal::FactoryTableWrapper::FactoryTableWrapper() { initialize(); } -Ice::FactoryTableWrapper::~FactoryTableWrapper() +IceInternal::FactoryTableWrapper::~FactoryTableWrapper() { finalize(); } @@ -117,7 +117,7 @@ Ice::FactoryTableWrapper::~FactoryTableWrapper() // the number of calls made. // void -Ice::FactoryTableWrapper::initialize() +IceInternal::FactoryTableWrapper::initialize() { IceUtil::StaticMutex::Lock lock(_m); if(_initCount == 0) @@ -131,7 +131,7 @@ Ice::FactoryTableWrapper::initialize() // Delete the table if its reference count drops to zero. // void -Ice::FactoryTableWrapper::finalize() +IceInternal::FactoryTableWrapper::finalize() { IceUtil::StaticMutex::Lock lock(_m); if(--_initCount == 0) @@ -140,5 +140,5 @@ Ice::FactoryTableWrapper::finalize() } } -IceUtil::StaticMutex Ice::FactoryTableWrapper::_m = ICEE_STATIC_MUTEX_INITIALIZER; -int Ice::FactoryTableWrapper::_initCount = 0; // Initialization count +IceUtil::StaticMutex IceInternal::FactoryTableWrapper::_m = ICEE_STATIC_MUTEX_INITIALIZER; +int IceInternal::FactoryTableWrapper::_initCount = 0; // Initialization count |