mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-23 18:20:50 +00:00
Fixed warning with gcc 6 [#METR-2944].
This commit is contained in:
parent
2dd04b39f7
commit
365be3c026
@ -49,9 +49,8 @@ private:
|
|||||||
|
|
||||||
~IConv()
|
~IConv()
|
||||||
{
|
{
|
||||||
if (-1 == iconv_close(impl)) /// throwing exception leads to std::terminate and it's ok.
|
if (-1 == iconv_close(impl))
|
||||||
throwFromErrno("Cannot iconv_close",
|
std::terminate();
|
||||||
ErrorCodes::LOGICAL_ERROR);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -282,8 +282,8 @@ struct CurrentlyMergingPartsTagger
|
|||||||
|
|
||||||
for (const auto & part : parts)
|
for (const auto & part : parts)
|
||||||
{
|
{
|
||||||
if (!storage->currently_merging.count(part)) /// leads to std::terminate, that's Ok.
|
if (!storage->currently_merging.count(part))
|
||||||
throw Exception("Untagging already untagged part " + part->name + ". This is a bug.", ErrorCodes::LOGICAL_ERROR);
|
std::terminate();
|
||||||
storage->currently_merging.erase(part);
|
storage->currently_merging.erase(part);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user