From 6f78243e328ad1da5246b79cfe0dc2294de6fc36 Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Thu, 22 Oct 2020 01:20:09 +0300 Subject: [PATCH] Use std::nullptr_t over nullptr_t --- src/Functions/FunctionsAES.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Functions/FunctionsAES.h b/src/Functions/FunctionsAES.h index 667fd38fab9..6600931118e 100644 --- a/src/Functions/FunctionsAES.h +++ b/src/Functions/FunctionsAES.h @@ -301,14 +301,14 @@ private: { const auto key_value = key_holder.setKey(key_size, key_column->getDataAt(r)); auto iv_value = StringRef{}; - if constexpr (!std::is_same_v>) + if constexpr (!std::is_same_v>) { iv_value = iv_column->getDataAt(r); } const auto input_value = input_column->getDataAt(r); auto aad_value = StringRef{}; - if constexpr (mode == CipherMode::RFC5116_AEAD_AES_GCM && !std::is_same_v>) + if constexpr (mode == CipherMode::RFC5116_AEAD_AES_GCM && !std::is_same_v>) { aad_value = aad_column->getDataAt(r); } @@ -348,7 +348,7 @@ private: onError("Failed to set key and IV"); // 1.a.2 Set AAD - if constexpr (!std::is_same_v>) + if constexpr (!std::is_same_v>) { const auto aad_data = aad_column->getDataAt(r); int tmp_len = 0; @@ -574,7 +574,7 @@ private: // 0: prepare key if required auto key_value = key_holder.setKey(key_size, key_column->getDataAt(r)); auto iv_value = StringRef{}; - if constexpr (!std::is_same_v>) + if constexpr (!std::is_same_v>) { iv_value = iv_column->getDataAt(r); } @@ -626,7 +626,7 @@ private: onError("Failed to set key and IV"); // 1.a.2: Set AAD if present - if constexpr (!std::is_same_v>) + if constexpr (!std::is_same_v>) { const auto aad_data = aad_column->getDataAt(r); int tmp_len = 0;