diff options
| author | Jose <jose@zeroc.com> | 2016-01-15 10:38:29 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-15 10:38:29 +0100 |
| commit | 21dbae16917e278c67316ed4a054bc78860abda3 (patch) | |
| tree | 34cf05e3856557c314522a88ac24e66b388a0510 /cpp/src | |
| parent | Remove deprecated string converter plug-in (diff) | |
| download | ice-21dbae16917e278c67316ed4a054bc78860abda3.tar.bz2 ice-21dbae16917e278c67316ed4a054bc78860abda3.tar.xz ice-21dbae16917e278c67316ed4a054bc78860abda3.zip | |
Rename PLUGIN_FACTORY typedef
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Initialize.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/PluginManagerI.cpp | 14 | ||||
| -rw-r--r-- | cpp/src/Ice/PluginManagerI.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index a524b3999f7..bdb3f4360ad 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -364,7 +364,7 @@ Ice::setProcessLogger(const LoggerPtr& logger) } void -Ice::registerPluginFactory(const std::string& name, PLUGIN_FACTORY factory, bool loadOnInitialize) +Ice::registerPluginFactory(const std::string& name, PluginFactory factory, bool loadOnInitialize) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex); PluginManagerI::registerPluginFactory(name, factory, loadOnInitialize); diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp index f0bf409c3f4..88f2c0f1838 100644 --- a/cpp/src/Ice/PluginManagerI.cpp +++ b/cpp/src/Ice/PluginManagerI.cpp @@ -25,7 +25,7 @@ const char * const Ice::PluginManagerI::_kindOfObject = "plugin"; namespace { -map<string, PLUGIN_FACTORY>* factories = 0; +map<string, PluginFactory>* factories = 0; vector<string>* loadOnInitialization = 0; class PluginFactoryDestroy @@ -46,14 +46,14 @@ PluginFactoryDestroy destroy; } void -Ice::PluginManagerI::registerPluginFactory(const std::string& name, PLUGIN_FACTORY factory, bool loadOnInit) +Ice::PluginManagerI::registerPluginFactory(const std::string& name, PluginFactory factory, bool loadOnInit) { if(factories == 0) { - factories = new map<string, PLUGIN_FACTORY>(); + factories = new map<string, PluginFactory>(); } - map<string, PLUGIN_FACTORY>::const_iterator p = factories->find(name); + map<string, PluginFactory>::const_iterator p = factories->find(name); if(p == factories->end()) { factories->insert(make_pair(name, factory)); @@ -440,7 +440,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St cmdArgs = properties->parseCommandLineOptions(name, cmdArgs); } - PLUGIN_FACTORY factory = 0; + PluginFactory factory = 0; DynamicLibraryPtr library; // @@ -450,7 +450,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St // if(factories) { - map<string, PLUGIN_FACTORY>::const_iterator p = factories->find(name); + map<string, PluginFactory>::const_iterator p = factories->find(name); if(p != factories->end()) { factory = p->second; @@ -479,7 +479,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St ex.reason = out.str(); throw ex; } - factory = reinterpret_cast<PLUGIN_FACTORY>(sym); + factory = reinterpret_cast<PluginFactory>(sym); } // diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h index 97aa03990a6..27720b289cf 100644 --- a/cpp/src/Ice/PluginManagerI.h +++ b/cpp/src/Ice/PluginManagerI.h @@ -21,13 +21,13 @@ namespace Ice { -typedef Ice::Plugin* (*PLUGIN_FACTORY)(const ::Ice::CommunicatorPtr&, const std::string&, const ::Ice::StringSeq&); +typedef Ice::Plugin* (*PluginFactory)(const ::Ice::CommunicatorPtr&, const std::string&, const ::Ice::StringSeq&); class PluginManagerI : public PluginManager, public IceUtil::Mutex { public: - static void registerPluginFactory(const std::string&, PLUGIN_FACTORY, bool); + static void registerPluginFactory(const std::string&, PluginFactory, bool); virtual void initializePlugins(); virtual StringSeq getPlugins(); |