diff options
| author | nechda <nechda@yandex-team.com> | 2024-09-19 20:44:54 +0300 |
|---|---|---|
| committer | nechda <nechda@yandex-team.com> | 2024-09-19 20:57:48 +0300 |
| commit | 7f1172f2cc68ca4d05a0c35ee9f601d41d4a026e (patch) | |
| tree | 237130e3940345cba68e04d5bae8b3339e3e5928 /contrib/libs | |
| parent | f4a740ff0d5b53d8a44150c09e019eaa6d331821 (diff) | |
| download | ydb-7f1172f2cc68ca4d05a0c35ee9f601d41d4a026e.tar.gz | |
Fix reimports
commit_hash:b4b0ee880890478723bec5ff7a5083ba1db1d1f7
Diffstat (limited to 'contrib/libs')
| -rw-r--r-- | contrib/libs/protobuf/src/google/protobuf/extension_set.h | 1 | ||||
| -rw-r--r-- | contrib/libs/protobuf/src/google/protobuf/json/internal/parser.cc | 4 | ||||
| -rw-r--r-- | contrib/libs/protobuf/ya.make | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/contrib/libs/protobuf/src/google/protobuf/extension_set.h b/contrib/libs/protobuf/src/google/protobuf/extension_set.h index c17bf4dc8a..a68db9efc1 100644 --- a/contrib/libs/protobuf/src/google/protobuf/extension_set.h +++ b/contrib/libs/protobuf/src/google/protobuf/extension_set.h @@ -1564,4 +1564,5 @@ void LinkExtensionReflection( } // namespace google #include "google/protobuf/port_undef.inc" + #endif // GOOGLE_PROTOBUF_EXTENSION_SET_H__ diff --git a/contrib/libs/protobuf/src/google/protobuf/json/internal/parser.cc b/contrib/libs/protobuf/src/google/protobuf/json/internal/parser.cc index 0da57a1f05..3bacf60c3b 100644 --- a/contrib/libs/protobuf/src/google/protobuf/json/internal/parser.cc +++ b/contrib/libs/protobuf/src/google/protobuf/json/internal/parser.cc @@ -972,11 +972,9 @@ y_absl::Status ParseFieldMask(JsonLexer& lex, const Desc<Traits>& desc, // Assume approximately six-letter words, so add one extra space for an // underscore for every six bytes. snake_path.reserve(path.size() * 7 / 6); - - // Port from protobuf 21.x for entity/ugc (TODO remove?). + // Port from protobuf 21.x bool is_quoted = false; bool is_escaping = false; - for (char c : path) { // Outputs quoted string as-is. if (is_quoted) { diff --git a/contrib/libs/protobuf/ya.make b/contrib/libs/protobuf/ya.make index ef458741f3..e72de69ce9 100644 --- a/contrib/libs/protobuf/ya.make +++ b/contrib/libs/protobuf/ya.make @@ -43,9 +43,9 @@ ENDIF() PEERDIR( contrib/libs/zlib - library/cpp/sanitizer/include - contrib/restricted/abseil-cpp-tstring/y_absl/status contrib/restricted/abseil-cpp-tstring/y_absl/log + contrib/restricted/abseil-cpp-tstring/y_absl/status + library/cpp/sanitizer/include ) ADDINCL( |