diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-04 14:03:06 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-04 14:03:06 +0300 |
| commit | b61be8e632d1cafa8afb229ea0a5b6117ca7125b (patch) | |
| tree | 96a36f21d4064f32d1912cbc85e4135788ff70b3 /contrib/libs | |
| parent | 7ce58bf82abf75fdc15c2e6fa3aceadcfecfdca1 (diff) | |
| download | ydb-b61be8e632d1cafa8afb229ea0a5b6117ca7125b.tar.gz | |
intermediate changes
ref:c67faec740b4d59ed47c6dfdc7076c904650af60
Diffstat (limited to 'contrib/libs')
| -rw-r--r-- | contrib/libs/grpc/grpc_unsecure/ya.make | 2 | ||||
| -rw-r--r-- | contrib/libs/grpc/src/core/lib/gpr/sync_abseil.cc | 4 | ||||
| -rw-r--r-- | contrib/libs/grpc/src/core/lib/security/authorization/mock_cel/statusor.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/contrib/libs/grpc/grpc_unsecure/ya.make b/contrib/libs/grpc/grpc_unsecure/ya.make index 38ef63eb18..3c0d33fec1 100644 --- a/contrib/libs/grpc/grpc_unsecure/ya.make +++ b/contrib/libs/grpc/grpc_unsecure/ya.make @@ -23,7 +23,7 @@ PEERDIR( ADDINCL( GLOBAL contrib/libs/grpc/include - contrib/libs/c-ares + contrib/libs/c-ares/include ${ARCADIA_BUILD_ROOT}/contrib/libs/grpc contrib/libs/grpc contrib/libs/grpc/src/core/ext/upb-generated diff --git a/contrib/libs/grpc/src/core/lib/gpr/sync_abseil.cc b/contrib/libs/grpc/src/core/lib/gpr/sync_abseil.cc index c224be2eee..86b0d03b67 100644 --- a/contrib/libs/grpc/src/core/lib/gpr/sync_abseil.cc +++ b/contrib/libs/grpc/src/core/lib/gpr/sync_abseil.cc @@ -50,12 +50,12 @@ void gpr_mu_destroy(gpr_mu* mu) { reinterpret_cast<y_absl::Mutex*>(mu)->~Mutex(); } -void gpr_mu_lock(gpr_mu* mu) ABSL_NO_THREAD_SAFETY_ANALYSIS { +void gpr_mu_lock(gpr_mu* mu) Y_ABSL_NO_THREAD_SAFETY_ANALYSIS { GPR_TIMER_SCOPE("gpr_mu_lock", 0); reinterpret_cast<y_absl::Mutex*>(mu)->Lock(); } -void gpr_mu_unlock(gpr_mu* mu) ABSL_NO_THREAD_SAFETY_ANALYSIS { +void gpr_mu_unlock(gpr_mu* mu) Y_ABSL_NO_THREAD_SAFETY_ANALYSIS { GPR_TIMER_SCOPE("gpr_mu_unlock", 0); reinterpret_cast<y_absl::Mutex*>(mu)->Unlock(); } diff --git a/contrib/libs/grpc/src/core/lib/security/authorization/mock_cel/statusor.h b/contrib/libs/grpc/src/core/lib/security/authorization/mock_cel/statusor.h index 2002d814c9..805184614d 100644 --- a/contrib/libs/grpc/src/core/lib/security/authorization/mock_cel/statusor.h +++ b/contrib/libs/grpc/src/core/lib/security/authorization/mock_cel/statusor.h @@ -28,7 +28,7 @@ namespace mock_cel { // Once gRPC imports the CEL library, this file will be removed. template <typename T> -class ABSL_MUST_USE_RESULT StatusOr; +class Y_ABSL_MUST_USE_RESULT StatusOr; template <typename T> class StatusOr { |