summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2008-02-13 14:51:18 -0330
committerDwayne Boone <dwayne@zeroc.com>2008-02-13 14:51:18 -0330
commitfc08e68321a0a2790d4ab2822d147d9f5a39b7d9 (patch)
tree9755b091c212a5b90d4c9eaaf3a4002d052f7679 /cpp/src
parentBug 2491 - Use getPropertyAsList (diff)
downloadice-fc08e68321a0a2790d4ab2822d147d9f5a39b7d9.tar.bz2
ice-fc08e68321a0a2790d4ab2822d147d9f5a39b7d9.tar.xz
ice-fc08e68321a0a2790d4ab2822d147d9f5a39b7d9.zip
Fixed Windows compile errors
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/PluginManagerI.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index ec7bae151d0..51c254b6e77 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -166,28 +166,28 @@ Ice::PluginManagerI::loadPlugins(int& argc, char* argv[])
{
string name = *p;
- map<string, PluginPtr>::iterator p = _plugins.find(name);
- if(p != _plugins.end())
+ map<string, PluginPtr>::iterator q = _plugins.find(name);
+ if(q != _plugins.end())
{
PluginInitializationException ex(__FILE__, __LINE__);
ex.reason = "plugin `" + name + "' already loaded";
throw ex;
}
- PropertyDict::iterator q = plugins.find("Ice.Plugin." + name + ".cpp");
- if(q == plugins.end())
+ PropertyDict::iterator r = plugins.find("Ice.Plugin." + name + ".cpp");
+ if(r == plugins.end())
{
- q = plugins.find("Ice.Plugin." + name);
+ r = plugins.find("Ice.Plugin." + name);
}
else
{
plugins.erase("Ice.Plugin." + name);
}
- if(q != plugins.end())
+ if(r != plugins.end())
{
- loadPlugin(name, q->second, cmdArgs);
- plugins.erase(q);
+ loadPlugin(name, r->second, cmdArgs);
+ plugins.erase(r);
}
else
{