diff options
author | Michi Henning <michi@zeroc.com> | 2002-12-05 06:59:17 +0000 |
---|---|---|
committer | Michi Henning <michi@zeroc.com> | 2002-12-05 06:59:17 +0000 |
commit | 531bc8037fb5cebb2201605eba4677348d603ba2 (patch) | |
tree | 47e8fd6148aa639ea041926f111790eb2b58bcda /cpp/src | |
parent | Added AlreadyRegisteredException and NotRegisteredException. Removed (diff) | |
download | ice-531bc8037fb5cebb2201605eba4677348d603ba2.tar.bz2 ice-531bc8037fb5cebb2201605eba4677348d603ba2.tar.xz ice-531bc8037fb5cebb2201605eba4677348d603ba2.zip |
Changed the implementation of the various _kindOfObject members because
bloody VC++ can't handle initialization of static non-integral class
members :-(
Diffstat (limited to 'cpp/src')
-rw-r--r-- | cpp/src/Ice/Object.cpp | 2 | ||||
-rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 2 | ||||
-rw-r--r-- | cpp/src/Ice/ObjectAdapterI.h | 2 | ||||
-rw-r--r-- | cpp/src/Ice/ObjectFactoryManager.cpp | 2 | ||||
-rw-r--r-- | cpp/src/Ice/ObjectFactoryManager.h | 2 | ||||
-rw-r--r-- | cpp/src/Ice/PluginManagerI.cpp | 2 | ||||
-rw-r--r-- | cpp/src/Ice/PluginManagerI.h | 2 | ||||
-rw-r--r-- | cpp/src/Ice/UserExceptionFactoryManager.cpp | 2 | ||||
-rw-r--r-- | cpp/src/Ice/UserExceptionFactoryManager.h | 2 |
9 files changed, 14 insertions, 4 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index 6b49eca3bf1..111fc2413a7 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -25,6 +25,8 @@ using namespace IceInternal; void IceInternal::incRef(Object* p) { p->__incRef(); } void IceInternal::decRef(Object* p) { p->__decRef(); } +const char * const Ice::Object::_kindOfObject = "facet"; + Ice::Object::Object() : _activeFacetMapHint(_activeFacetMap.end()) { diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 49ce80df465..f4c1fafddd4 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -41,6 +41,8 @@ using namespace std; using namespace Ice; using namespace IceInternal; +const char * const Ice::ObjectAdapterI::_kindOfObject = "object adapter"; + CommunicatorPtr Ice::ObjectAdapterI::getCommunicator() { diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index 59322ebf7b1..1c5e01b9fca 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -97,7 +97,7 @@ private: IceUtil::Mutex _routerEndpointsMutex; ::IceInternal::LocatorInfoPtr _locatorInfo; int _usageCount; - static const char * const _kindOfObject = "object adapter"; + static const char * const _kindOfObject; }; } diff --git a/cpp/src/Ice/ObjectFactoryManager.cpp b/cpp/src/Ice/ObjectFactoryManager.cpp index 02a646cbfce..59021c4fa6d 100644 --- a/cpp/src/Ice/ObjectFactoryManager.cpp +++ b/cpp/src/Ice/ObjectFactoryManager.cpp @@ -21,6 +21,8 @@ using namespace std; using namespace Ice; using namespace IceInternal; +const char * const IceInternal::ObjectFactoryManager::_kindOfObject = "object factory"; + void IceInternal::incRef(ObjectFactoryManager* p) { p->__incRef(); } void IceInternal::decRef(ObjectFactoryManager* p) { p->__decRef(); } diff --git a/cpp/src/Ice/ObjectFactoryManager.h b/cpp/src/Ice/ObjectFactoryManager.h index fd79fc4cd4b..0f7c1554192 100644 --- a/cpp/src/Ice/ObjectFactoryManager.h +++ b/cpp/src/Ice/ObjectFactoryManager.h @@ -39,7 +39,7 @@ private: std::map<std::string, ::Ice::ObjectFactoryPtr> _factoryMap; std::map<std::string, ::Ice::ObjectFactoryPtr>::iterator _factoryMapHint; - static const char * const _kindOfObject = "object factory"; + static const char * const _kindOfObject; }; } diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp index f8580f76269..6981c74d51a 100644 --- a/cpp/src/Ice/PluginManagerI.cpp +++ b/cpp/src/Ice/PluginManagerI.cpp @@ -24,6 +24,8 @@ using namespace std; using namespace Ice; using namespace IceInternal; +const char * const Ice::PluginManagerI::_kindOfObject = "plug-in"; + typedef Ice::Plugin* (*PLUGIN_FACTORY)(const CommunicatorPtr&, const string&, const StringSeq&); PluginPtr diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h index 7a681c67b51..32d37473cc5 100644 --- a/cpp/src/Ice/PluginManagerI.h +++ b/cpp/src/Ice/PluginManagerI.h @@ -46,7 +46,7 @@ private: IceInternal::DynamicLibraryListPtr _libraries; std::map<std::string, PluginPtr> _plugins; - static const char * const _kindOfObject = "plug-in"; + static const char * const _kindOfObject; }; } diff --git a/cpp/src/Ice/UserExceptionFactoryManager.cpp b/cpp/src/Ice/UserExceptionFactoryManager.cpp index 3d276698c8f..7a086b560c5 100644 --- a/cpp/src/Ice/UserExceptionFactoryManager.cpp +++ b/cpp/src/Ice/UserExceptionFactoryManager.cpp @@ -24,6 +24,8 @@ using namespace IceInternal; void IceInternal::incRef(UserExceptionFactoryManager* p) { p->__incRef(); } void IceInternal::decRef(UserExceptionFactoryManager* p) { p->__decRef(); } +const char * const UserExceptionFactoryManager::_kindOfObject = "user exception factory"; + void IceInternal::UserExceptionFactoryManager::add(const UserExceptionFactoryPtr& factory, const string& id) { diff --git a/cpp/src/Ice/UserExceptionFactoryManager.h b/cpp/src/Ice/UserExceptionFactoryManager.h index 5832ea74367..7e836fe6803 100644 --- a/cpp/src/Ice/UserExceptionFactoryManager.h +++ b/cpp/src/Ice/UserExceptionFactoryManager.h @@ -39,7 +39,7 @@ private: std::map<std::string, ::Ice::UserExceptionFactoryPtr> _factoryMap; std::map<std::string, ::Ice::UserExceptionFactoryPtr>::iterator _factoryMapHint; - static const char * const _kindOfObject = "user exception factory"; + static const char * const _kindOfObject; }; } |