generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 02:53:10 +01:00
Code Issues Projects Releases Wiki Activity

integrated changes from 1.3.6

Browse Source
This commit is contained in:
Guenter Obiltschnig
2009-06-17 06:47:38 +00:00
parent 09fce4461e
commit 0336789662
24 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Util/src/OptionSet.cpp
View File

@@ -1,7 +1,7 @@
//
// OptionSet.cpp
//
// $Id: //poco/svn/Util/src/OptionSet.cpp#1 $
// $Id: //poco/Main/Util/src/OptionSet.cpp#9 $
//
// Library: Util
// Package: Options
@@ -89,7 +89,7 @@ bool OptionSet::hasOption(const std::string& name, bool matchShort) const
bool found = false;
for (Iterator it = _options.begin(); it != _options.end(); ++it)
{
if (matchShort && it->matchesShort(name) || !matchShort && it->matchesFull(name))
if ((matchShort && it->matchesShort(name)) || (!matchShort && it->matchesFull(name)))
{
if (!found)
found = true;
@@ -106,7 +106,7 @@ const Option& OptionSet::getOption(const std::string& name, bool matchShort) con
const Option* pOption = 0;
for (Iterator it = _options.begin(); it != _options.end(); ++it)
{
if (matchShort && it->matchesShort(name) || !matchShort && it->matchesPartial(name))
if ((matchShort && it->matchesShort(name)) || (!matchShort && it->matchesPartial(name)))
{
if (!pOption)
{