highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-12 13:43:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not shadow variables (gcc set)

Browse Source
This commit is contained in:
Pavel Janík
2016-11-10 08:00:05 +01:00
parent 43e8150ef6
commit 9de90bb749
14 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/timedata.h
View File

@@ -27,9 +27,9 @@ private:
unsigned int nSize;
public:
CMedianFilter(unsigned int size, T initial_value) : nSize(size)
CMedianFilter(unsigned int _size, T initial_value) : nSize(_size)
{
vValues.reserve(size);
vValues.reserve(_size);
vValues.push_back(initial_value);
vSorted = vValues;
}
@@ -48,14 +48,14 @@ public:
T median() const
{
int size = vSorted.size();
assert(size > 0);
if (size & 1) // Odd number of elements
int vSortedSize = vSorted.size();
assert(vSortedSize > 0);
if (vSortedSize & 1) // Odd number of elements
{
return vSorted[size / 2];
return vSorted[vSortedSize / 2];
} else // Even number of elements
{
return (vSorted[size / 2 - 1] + vSorted[size / 2]) / 2;
return (vSorted[vSortedSize / 2 - 1] + vSorted[vSortedSize / 2]) / 2;
}
}