thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16248 from azat/nullptr_t-build-fix

Browse Source 
Use std::nullptr_t over nullptr_t (build fix)
This commit is contained in:
alexey-milovidov 2020-10-22 07:02:38 +03:00 committed by GitHub
commit 0433bc2034
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Functions/FunctionsAES.h
View File

@ -301,14 +301,14 @@ private:
{ {
const auto key_value = key_holder.setKey(key_size, key_column->getDataAt(r)); const auto key_value = key_holder.setKey(key_size, key_column->getDataAt(r));
auto iv_value = StringRef{}; auto iv_value = StringRef{};
if constexpr (!std::is_same_v<nullptr_t, std::decay_t<IvColumnType>>) if constexpr (!std::is_same_v<std::nullptr_t, std::decay_t<IvColumnType>>)
{ {
iv_value = iv_column->getDataAt(r); iv_value = iv_column->getDataAt(r);
} }
const auto input_value = input_column->getDataAt(r); const auto input_value = input_column->getDataAt(r);
auto aad_value = StringRef{}; auto aad_value = StringRef{};
if constexpr (mode == CipherMode::RFC5116_AEAD_AES_GCM && !std::is_same_v<nullptr_t, std::decay_t<AadColumnType>>) if constexpr (mode == CipherMode::RFC5116_AEAD_AES_GCM && !std::is_same_v<std::nullptr_t, std::decay_t<AadColumnType>>)
{ {
aad_value = aad_column->getDataAt(r); aad_value = aad_column->getDataAt(r);
} }
@ -348,7 +348,7 @@ private:
onError("Failed to set key and IV"); onError("Failed to set key and IV");
// 1.a.2 Set AAD // 1.a.2 Set AAD
if constexpr (!std::is_same_v<nullptr_t, std::decay_t<AadColumnType>>) if constexpr (!std::is_same_v<std::nullptr_t, std::decay_t<AadColumnType>>)
{ {
const auto aad_data = aad_column->getDataAt(r); const auto aad_data = aad_column->getDataAt(r);
int tmp_len = 0; int tmp_len = 0;
@ -574,7 +574,7 @@ private:
// 0: prepare key if required // 0: prepare key if required
auto key_value = key_holder.setKey(key_size, key_column->getDataAt(r)); auto key_value = key_holder.setKey(key_size, key_column->getDataAt(r));
auto iv_value = StringRef{}; auto iv_value = StringRef{};
if constexpr (!std::is_same_v<nullptr_t, std::decay_t<IvColumnType>>) if constexpr (!std::is_same_v<std::nullptr_t, std::decay_t<IvColumnType>>)
{ {
iv_value = iv_column->getDataAt(r); iv_value = iv_column->getDataAt(r);
} }
@ -626,7 +626,7 @@ private:
onError("Failed to set key and IV"); onError("Failed to set key and IV");
// 1.a.2: Set AAD if present // 1.a.2: Set AAD if present
if constexpr (!std::is_same_v<nullptr_t, std::decay_t<AadColumnType>>) if constexpr (!std::is_same_v<std::nullptr_t, std::decay_t<AadColumnType>>)
{ {
const auto aad_data = aad_column->getDataAt(r); const auto aad_data = aad_column->getDataAt(r);
int tmp_len = 0; int tmp_len = 0;