thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-17 13:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Darwin build (std::max candidate template)

Browse Source
This commit is contained in:
vdimir 2020-08-15 20:08:59 +00:00
parent 8fc470d1c5
commit df63ada6cc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Functions/PositionImpl.h
View File

@ -243,7 +243,7 @@ struct PositionImpl
UInt64 start_pos, UInt64 start_pos,
UInt64 & res) UInt64 & res)
{ {
auto start = std::max(start_pos, 1ul); auto start = std::max(start_pos, UInt64(1));
if (needle.size() == 0) if (needle.size() == 0)
{ {
@ -311,7 +311,7 @@ struct PositionImpl
size_t needle_size = needle_offsets[i] - prev_needle_offset - 1; size_t needle_size = needle_offsets[i] - prev_needle_offset - 1;
size_t haystack_size = haystack_offsets[i] - prev_haystack_offset - 1; size_t haystack_size = haystack_offsets[i] - prev_haystack_offset - 1;
auto start = start_pos != nullptr ? std::max(start_pos->getUInt(i), 1ul) : 1ul; auto start = start_pos != nullptr ? std::max(start_pos->getUInt(i), UInt64(1)) : UInt64(1);
if (start > haystack_size + 1) if (start > haystack_size + 1)
{ {
@ -371,7 +371,7 @@ struct PositionImpl
{ {
size_t needle_size = needle_offsets[i] - prev_needle_offset - 1; size_t needle_size = needle_offsets[i] - prev_needle_offset - 1;
auto start = start_pos != nullptr ? std::max(start_pos->getUInt(i), 1ul) : 1ul; auto start = start_pos != nullptr ? std::max(start_pos->getUInt(i), UInt64(1)) : UInt64(1);
if (start > haystack.size() + 1) if (start > haystack.size() + 1)
{ {