diff options
| author | YDBot <[email protected]> | 2025-09-26 05:40:56 +0000 |
|---|---|---|
| committer | YDBot <[email protected]> | 2025-09-26 05:40:56 +0000 |
| commit | a7e5af7043672a57f330696519f435f19fcd03d0 (patch) | |
| tree | fa751accfbb8afcd928340c9078b00453c07dde1 /contrib/restricted/aws/aws-crt-cpp | |
| parent | d7cd65635ff05f602b8eb7c6e2a42217057dd2c6 (diff) | |
| parent | ee5ee24a4d661a146d6142a78050207193937281 (diff) | |
Merge pull request #25828 from ydb-platform/merge-rightlib-250926-0050
Diffstat (limited to 'contrib/restricted/aws/aws-crt-cpp')
4 files changed, 8 insertions, 17 deletions
diff --git a/contrib/restricted/aws/aws-crt-cpp/.yandex_meta/override.nix b/contrib/restricted/aws/aws-crt-cpp/.yandex_meta/override.nix index 36dca6d59c9..d6c54aabcac 100644 --- a/contrib/restricted/aws/aws-crt-cpp/.yandex_meta/override.nix +++ b/contrib/restricted/aws/aws-crt-cpp/.yandex_meta/override.nix @@ -7,4 +7,6 @@ pkgs: attrs: with pkgs; with attrs; rec { rev = "v${version}"; hash = "sha256-z/9ifBv4KbH5RiR1t1Dz8cCWZlHrMSyB8/w4pdTscw0="; }; + + patches = []; } diff --git a/contrib/restricted/aws/aws-crt-cpp/include/aws/crt/StringView.h b/contrib/restricted/aws/aws-crt-cpp/include/aws/crt/StringView.h index b8c6c66881a..55528d63ebf 100644 --- a/contrib/restricted/aws/aws-crt-cpp/include/aws/crt/StringView.h +++ b/contrib/restricted/aws/aws-crt-cpp/include/aws/crt/StringView.h @@ -819,22 +819,22 @@ namespace Aws { inline namespace string_view_literals { - inline basic_string_view<char> operator"" _sv(const char *s, size_t length) noexcept + inline basic_string_view<char> operator""_sv(const char *s, size_t length) noexcept { return basic_string_view<char>(s, length); } - inline basic_string_view<wchar_t> operator"" _sv(const wchar_t *s, size_t length) noexcept + inline basic_string_view<wchar_t> operator""_sv(const wchar_t *s, size_t length) noexcept { return basic_string_view<wchar_t>(s, length); } - inline basic_string_view<char16_t> operator"" _sv(const char16_t *s, size_t length) noexcept + inline basic_string_view<char16_t> operator""_sv(const char16_t *s, size_t length) noexcept { return basic_string_view<char16_t>(s, length); } - inline basic_string_view<char32_t> operator"" _sv(const char32_t *s, size_t length) noexcept + inline basic_string_view<char32_t> operator""_sv(const char32_t *s, size_t length) noexcept { return basic_string_view<char32_t>(s, length); } diff --git a/contrib/restricted/aws/aws-crt-cpp/patches/02-pr728-deprecated-literal-operator.sh b/contrib/restricted/aws/aws-crt-cpp/patches/02-pr728-deprecated-literal-operator.sh new file mode 100644 index 00000000000..a143fd8997c --- /dev/null +++ b/contrib/restricted/aws/aws-crt-cpp/patches/02-pr728-deprecated-literal-operator.sh @@ -0,0 +1,2 @@ +set -xue +sed -e 's|operator"" |operator""|g' include/aws/crt/StringView.h -i diff --git a/contrib/restricted/aws/aws-crt-cpp/ya.make b/contrib/restricted/aws/aws-crt-cpp/ya.make index 09580309250..7ccb9004352 100644 --- a/contrib/restricted/aws/aws-crt-cpp/ya.make +++ b/contrib/restricted/aws/aws-crt-cpp/ya.make @@ -44,23 +44,10 @@ CFLAGS( -DAWS_HTTP_USE_IMPORT_EXPORT -DAWS_IO_USE_IMPORT_EXPORT -DAWS_MQTT_USE_IMPORT_EXPORT - -DAWS_MQTT_WITH_WEBSOCKETS -DAWS_S3_USE_IMPORT_EXPORT -DAWS_SDKUTILS_USE_IMPORT_EXPORT -DAWS_USE_EPOLL -DCJSON_HIDE_SYMBOLS - -DS2N_CLONE_SUPPORTED - -DS2N_CPUID_AVAILABLE - -DS2N_FALL_THROUGH_SUPPORTED - -DS2N_FEATURES_AVAILABLE - -DS2N_KYBER512R3_AVX2_BMI2 - -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH - -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX - -DS2N_LIBCRYPTO_SUPPORTS_EVP_RC4 - -DS2N_MADVISE_SUPPORTED - -DS2N_PLATFORM_SUPPORTS_KTLS - -DS2N_STACKTRACE - -DS2N___RESTRICT__SUPPORTED ) IF (OS_WINDOWS) |