diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-02-29 15:51:11 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-02-29 16:39:54 +0800 |
| commit | fb4132881dde7c9b135d713a06a3b64db1f706db (patch) | |
| tree | 8a037e9d4cae7ed15360ab0878d14b32ac3150a4 /cpp/src/Ice/PluginManagerI.cpp | |
| parent | fixing mode on php/config/Make.rules.mak (diff) | |
| download | ice-fb4132881dde7c9b135d713a06a3b64db1f706db.tar.bz2 ice-fb4132881dde7c9b135d713a06a3b64db1f706db.tar.xz ice-fb4132881dde7c9b135d713a06a3b64db1f706db.zip | |
Merge HA IceStorm branch.
- http://bugzilla/bugzilla/show_bug.cgi?id=2706
- http://bugzilla/bugzilla/show_bug.cgi?id=2705
Diffstat (limited to 'cpp/src/Ice/PluginManagerI.cpp')
| -rw-r--r-- | cpp/src/Ice/PluginManagerI.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp index 0b594787db7..9dc03d892fe 100644 --- a/cpp/src/Ice/PluginManagerI.cpp +++ b/cpp/src/Ice/PluginManagerI.cpp @@ -167,8 +167,7 @@ Ice::PluginManagerI::loadPlugins(int& argc, char* argv[]) { string name = *p; - map<string, PluginPtr>::iterator q = _plugins.find(name); - if(q != _plugins.end()) + if(_plugins.find(name) != _plugins.end()) { PluginInitializationException ex(__FILE__, __LINE__); ex.reason = "plugin `" + name + "' already loaded"; |