thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14059 from azat/gcc10-fixes

Browse Source 
gcc10 build fixes
This commit is contained in:
alexey-milovidov 2020-08-26 03:31:03 +03:00 committed by GitHub
commit 7271c9c983
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/AggregateFunctions/AggregateFunctionTimeSeriesGroupSum.h
View File

@ -108,13 +108,13 @@ struct AggregateFunctionTimeSeriesGroupSumData
else else
result.emplace_back(std::make_pair(t, v)); result.emplace_back(std::make_pair(t, v));
} }
size_t i = result.size() - 1; ssize_t i = result.size() - 1;
//reverse find out the index of timestamp that more than previous timestamp of t //reverse find out the index of timestamp that more than previous timestamp of t
while (result[i].first > it_ss->second.dps.front().first && i >= 0) while (result[i].first > it_ss->second.dps.front().first && i >= 0)
i--; i--;
i++; i++;
while (i < result.size() - 1) while (i < ssize_t(result.size()) - 1)
{ {
result[i].second += it_ss->second.getval(result[i].first); result[i].second += it_ss->second.getval(result[i].first);
i++; i++;

4
src/Common/UInt128.h
View File

@ -89,8 +89,8 @@ struct UInt128
UInt128 & operator= (const UInt64 rhs) { low = rhs; high = 0; return *this; } UInt128 & operator= (const UInt64 rhs) { low = rhs; high = 0; return *this; }
}; };
template <typename T> bool inline operator == (T a, const UInt128 b) { return b == a; } template <typename T> bool inline operator == (T a, const UInt128 b) { return b.operator==(a); }
template <typename T> bool inline operator != (T a, const UInt128 b) { return b != a; } template <typename T> bool inline operator != (T a, const UInt128 b) { return b.operator!=(a); }
template <typename T> bool inline operator >= (T a, const UInt128 b) { return b <= a; } template <typename T> bool inline operator >= (T a, const UInt128 b) { return b <= a; }
template <typename T> bool inline operator > (T a, const UInt128 b) { return b < a; } template <typename T> bool inline operator > (T a, const UInt128 b) { return b < a; }
template <typename T> bool inline operator <= (T a, const UInt128 b) { return b >= a; } template <typename T> bool inline operator <= (T a, const UInt128 b) { return b >= a; }