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

GH #1050 Data: fix gcc -Wshadow warnings

Browse Source
This commit is contained in:
Miklos Vajna
2016-01-18 22:52:27 +01:00
parent 0b5c50941c
commit 6d1a4f20ba
27 changed files with 290 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Foundation/include/Poco/LinearHashTable.h
View File

@@ -281,15 +281,15 @@ public:
/// Returns an iterator pointing to the first entry, if one exists.
{
BucketVecIterator it(_buckets.begin());
BucketVecIterator end(_buckets.end());
while (it != end && it->empty())
BucketVecIterator itEnd(_buckets.end());
while (it != itEnd && it->empty())
{
++it;
}
if (it == end)
return this->end();
if (it == itEnd)
return end();
else
return ConstIterator(it, end, it->begin());
return ConstIterator(it, itEnd, it->begin());
}
ConstIterator end() const
@@ -302,15 +302,15 @@ public:
/// Returns an iterator pointing to the first entry, if one exists.
{
BucketVecIterator it(_buckets.begin());
BucketVecIterator end(_buckets.end());
while (it != end && it->empty())
BucketVecIterator itEnd(_buckets.end());
while (it != itEnd && it->empty())
{
++it;
}
if (it == end)
return this->end();
if (it == itEnd)
return end();
else
return Iterator(it, end, it->begin());
return Iterator(it, itEnd, it->begin());
}
Iterator end()
@@ -400,8 +400,8 @@ public:
void clear()
/// Erases all elements.
{
LinearHashTable empty;
swap(empty);
LinearHashTable emptyTable;
swap(emptyTable);
}
std::size_t size() const