More strict aliasing

This commit is contained in:
Alexey Milovidov 2020-01-03 18:01:24 +03:00 committed by Amos Bird
parent cce1e46b45
commit 52153d15cc
No known key found for this signature in database
GPG Key ID: 80D430DCBECFEDB4
2 changed files with 2 additions and 2 deletions

View File

@ -660,7 +660,7 @@ void TrieDictionary::has(const Attribute &, const Columns & key_columns, PaddedP
if (unlikely(addr.size != 16)) if (unlikely(addr.size != 16))
throw Exception("Expected key to be FixedString(16)", ErrorCodes::LOGICAL_ERROR); throw Exception("Expected key to be FixedString(16)", ErrorCodes::LOGICAL_ERROR);
uintptr_t slot = btrie_find_a6(trie, reinterpret_cast<const UInt8 *>(addr.data)); uintptr_t slot = btrie_find_a6(trie, reinterpret_cast<const uint8_t *>(addr.data));
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic warning "-Wold-style-cast" #pragma GCC diagnostic warning "-Wold-style-cast"
out[i] = (slot != BTRIE_NULL); out[i] = (slot != BTRIE_NULL);

View File

@ -108,7 +108,7 @@ namespace DB
{ {
if (!chunk.IsNull(offset_i) && buffer) if (!chunk.IsNull(offset_i) && buffer)
{ {
const UInt8 * raw_data = buffer->data() + chunk.value_offset(offset_i); const auto * raw_data = buffer->data() + chunk.value_offset(offset_i);
column_chars_t.insert_assume_reserved(raw_data, raw_data + chunk.value_length(offset_i)); column_chars_t.insert_assume_reserved(raw_data, raw_data + chunk.value_length(offset_i));
} }
column_chars_t.emplace_back('\0'); column_chars_t.emplace_back('\0');