summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Util.cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2008-04-28 11:16:08 +0800
committerMatthew Newhook <matthew@zeroc.com>2008-04-28 11:16:08 +0800
commitb4c5f6cf95cfe3d56c967b91deaeeb87da7148ce (patch)
tree2b7620aa78f750ce178e39d1b8a99c3e5f6e01db /cpp/src/IceGrid/Util.cpp
parentremoved bogus rule. (diff)
parentminor edits to README for secure IceGrid demo (diff)
downloadice-b4c5f6cf95cfe3d56c967b91deaeeb87da7148ce.tar.bz2
ice-b4c5f6cf95cfe3d56c967b91deaeeb87da7148ce.tar.xz
ice-b4c5f6cf95cfe3d56c967b91deaeeb87da7148ce.zip
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/IceGrid/Util.cpp')
-rw-r--r--cpp/src/IceGrid/Util.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/Util.cpp b/cpp/src/IceGrid/Util.cpp
index 3525eb7ba92..81675c30696 100644
--- a/cpp/src/IceGrid/Util.cpp
+++ b/cpp/src/IceGrid/Util.cpp
@@ -76,18 +76,16 @@ IceGrid::getProperty(const PropertyDescriptorSeq& properties, const string& name
}
bool
-IceGrid::isSet(const PropertyDescriptorSeq& properties, const string& name)
+IceGrid::hasProperty(const PropertyDescriptorSeq& properties, const string& name)
{
- bool result = false;
-
for(PropertyDescriptorSeq::const_iterator q = properties.begin(); q != properties.end(); ++q)
{
if(q->name == name)
{
- result = (q->value != "");
+ return true;
}
}
- return result;
+ return false;
}
PropertyDescriptor
@@ -99,7 +97,6 @@ IceGrid::createProperty(const string& name, const string& value)
return prop;
}
-
int
IceGrid::getMMVersion(const string& o)
{