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

merge some changes from develop branch; modernize and clean-up code; remove support for compiling without POCO_WIN32_UTF8

Browse Source
This commit is contained in:
Günter Obiltschnig
2020-01-09 10:08:09 +01:00
parent 7c177b6f89
commit 1bf40a0cd2
389 changed files with 3029 additions and 4111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Util/src/OptionSet.cpp
View File

@@ -65,9 +65,9 @@ void OptionSet::addOption(const Option& option)
bool OptionSet::hasOption(const std::string& name, bool matchShort) const
{
bool found = false;
for (Iterator it = _options.begin(); it != _options.end(); ++it)
for (const auto& opt: _options)
{
if ((matchShort && it->matchesShort(name)) || (!matchShort && it->matchesFull(name)))
if ((matchShort && opt.matchesShort(name)) || (!matchShort && opt.matchesFull(name)))
{
if (!found)
found = true;
@@ -82,19 +82,19 @@ bool OptionSet::hasOption(const std::string& name, bool matchShort) const
const Option& OptionSet::getOption(const std::string& name, bool matchShort) const
{
const Option* pOption = 0;
for (Iterator it = _options.begin(); it != _options.end(); ++it)
for (const auto& opt: _options)
{
if ((matchShort && it->matchesShort(name)) || (!matchShort && it->matchesPartial(name)))
if ((matchShort && opt.matchesShort(name)) || (!matchShort && opt.matchesPartial(name)))
{
if (!pOption)
{
pOption = &*it;
if (!matchShort && it->matchesFull(name))
pOption = &opt;
if (!matchShort && opt.matchesFull(name))
break;
}
else if (!matchShort && it->matchesFull(name))
else if (!matchShort && opt.matchesFull(name))
{
pOption = &*it;
pOption = &opt;
break;
}
else throw AmbiguousOptionException(name);