aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp/protobuf
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.ru>2022-02-10 16:45:12 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:45:12 +0300
commit49116032d905455a7b1c994e4a696afc885c1e71 (patch)
treebe835aa92c6248212e705f25388ebafcf84bc7a1 /library/cpp/protobuf
parent4e839db24a3bbc9f1c610c43d6faaaa99824dcca (diff)
downloadydb-49116032d905455a7b1c994e4a696afc885c1e71.tar.gz
Restoring authorship annotation for <thegeorg@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/protobuf')
-rw-r--r--library/cpp/protobuf/interop/cast.cpp6
-rw-r--r--library/cpp/protobuf/interop/ut/cast_ut.cpp4
-rw-r--r--library/cpp/protobuf/json/field_option.h6
-rw-r--r--library/cpp/protobuf/json/json2proto.cpp4
-rw-r--r--library/cpp/protobuf/json/proto2json.h8
-rw-r--r--library/cpp/protobuf/json/proto2json_printer.h6
-rw-r--r--library/cpp/protobuf/json/string_transform.cpp2
-rw-r--r--library/cpp/protobuf/util/cast.h4
-rw-r--r--library/cpp/protobuf/util/is_equal.cpp2
-rw-r--r--library/cpp/protobuf/util/is_equal_ut.cpp2
-rw-r--r--library/cpp/protobuf/util/iterators.h2
-rw-r--r--library/cpp/protobuf/util/merge.cpp2
-rw-r--r--library/cpp/protobuf/util/path.h4
-rw-r--r--library/cpp/protobuf/util/pb_io.cpp10
-rw-r--r--library/cpp/protobuf/util/repeated_field_utils.h2
-rw-r--r--library/cpp/protobuf/util/simple_reflection.h4
-rw-r--r--library/cpp/protobuf/util/sort.h2
-rw-r--r--library/cpp/protobuf/util/traits.h4
-rw-r--r--library/cpp/protobuf/util/walk.h4
-rw-r--r--library/cpp/protobuf/ya.make2
20 files changed, 40 insertions, 40 deletions
diff --git a/library/cpp/protobuf/interop/cast.cpp b/library/cpp/protobuf/interop/cast.cpp
index 4d950d51bf..c4cd59b417 100644
--- a/library/cpp/protobuf/interop/cast.cpp
+++ b/library/cpp/protobuf/interop/cast.cpp
@@ -1,8 +1,8 @@
#include <library/cpp/protobuf/interop/cast.h>
-#include <google/protobuf/duration.pb.h>
-#include <google/protobuf/timestamp.pb.h>
-#include <google/protobuf/util/time_util.h>
+#include <google/protobuf/duration.pb.h>
+#include <google/protobuf/timestamp.pb.h>
+#include <google/protobuf/util/time_util.h>
namespace NProtoInterop {
google::protobuf::Duration CastToProto(TDuration duration) {
diff --git a/library/cpp/protobuf/interop/ut/cast_ut.cpp b/library/cpp/protobuf/interop/ut/cast_ut.cpp
index 3319e4935a..6ef055b651 100644
--- a/library/cpp/protobuf/interop/ut/cast_ut.cpp
+++ b/library/cpp/protobuf/interop/ut/cast_ut.cpp
@@ -1,8 +1,8 @@
#include <library/cpp/protobuf/interop/cast.h>
#include <library/cpp/testing/unittest/registar.h>
-#include <google/protobuf/duration.pb.h>
-#include <google/protobuf/timestamp.pb.h>
+#include <google/protobuf/duration.pb.h>
+#include <google/protobuf/timestamp.pb.h>
static constexpr ui64 MicroSecondsInSecond = 1000 * 1000;
static constexpr ui64 NanoSecondsInMicroSecond = 1000;
diff --git a/library/cpp/protobuf/json/field_option.h b/library/cpp/protobuf/json/field_option.h
index f1c7b34908..c8a8bfbff5 100644
--- a/library/cpp/protobuf/json/field_option.h
+++ b/library/cpp/protobuf/json/field_option.h
@@ -1,8 +1,8 @@
#pragma once
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/message.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/descriptor.pb.h>
+#include <google/protobuf/message.h>
namespace NProtobufJson {
// Functor that defines whether given field has some option set to true
diff --git a/library/cpp/protobuf/json/json2proto.cpp b/library/cpp/protobuf/json/json2proto.cpp
index f84b245de3..640c10f5a5 100644
--- a/library/cpp/protobuf/json/json2proto.cpp
+++ b/library/cpp/protobuf/json/json2proto.cpp
@@ -3,8 +3,8 @@
#include <library/cpp/json/json_value.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
+#include <google/protobuf/descriptor.h>
#include <util/generic/hash.h>
#include <util/generic/maybe.h>
diff --git a/library/cpp/protobuf/json/proto2json.h b/library/cpp/protobuf/json/proto2json.h
index 9fd326655a..89a1781a40 100644
--- a/library/cpp/protobuf/json/proto2json.h
+++ b/library/cpp/protobuf/json/proto2json.h
@@ -3,11 +3,11 @@
#include "config.h"
#include "json_output.h"
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/message.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/descriptor.pb.h>
+#include <google/protobuf/message.h>
-#include <util/generic/fwd.h>
+#include <util/generic/fwd.h>
#include <util/generic/vector.h>
#include <util/generic/yexception.h>
#include <util/stream/str.h>
diff --git a/library/cpp/protobuf/json/proto2json_printer.h b/library/cpp/protobuf/json/proto2json_printer.h
index aa44081a9e..9dc5aa86c6 100644
--- a/library/cpp/protobuf/json/proto2json_printer.h
+++ b/library/cpp/protobuf/json/proto2json_printer.h
@@ -2,9 +2,9 @@
#include "json_output.h"
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/message.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/descriptor.pb.h>
+#include <google/protobuf/message.h>
#include <util/generic/strbuf.h>
#include <util/generic/string.h>
diff --git a/library/cpp/protobuf/json/string_transform.cpp b/library/cpp/protobuf/json/string_transform.cpp
index eca56c1b3a..7c42daa677 100644
--- a/library/cpp/protobuf/json/string_transform.cpp
+++ b/library/cpp/protobuf/json/string_transform.cpp
@@ -1,6 +1,6 @@
#include "string_transform.h"
-#include <google/protobuf/stubs/strutil.h>
+#include <google/protobuf/stubs/strutil.h>
#include <library/cpp/string_utils/base64/base64.h>
diff --git a/library/cpp/protobuf/util/cast.h b/library/cpp/protobuf/util/cast.h
index b62927331b..83749dfcee 100644
--- a/library/cpp/protobuf/util/cast.h
+++ b/library/cpp/protobuf/util/cast.h
@@ -2,8 +2,8 @@
#include "traits.h"
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
#include <util/generic/cast.h>
diff --git a/library/cpp/protobuf/util/is_equal.cpp b/library/cpp/protobuf/util/is_equal.cpp
index 2af2b52759..227408006e 100644
--- a/library/cpp/protobuf/util/is_equal.cpp
+++ b/library/cpp/protobuf/util/is_equal.cpp
@@ -1,7 +1,7 @@
#include "is_equal.h"
#include "traits.h"
-#include <google/protobuf/descriptor.h>
+#include <google/protobuf/descriptor.h>
#include <util/generic/yexception.h>
#include <util/string/cast.h>
diff --git a/library/cpp/protobuf/util/is_equal_ut.cpp b/library/cpp/protobuf/util/is_equal_ut.cpp
index 9befdd5731..3ca4c90dd5 100644
--- a/library/cpp/protobuf/util/is_equal_ut.cpp
+++ b/library/cpp/protobuf/util/is_equal_ut.cpp
@@ -3,7 +3,7 @@
#include <library/cpp/testing/unittest/registar.h>
-#include <google/protobuf/descriptor.h>
+#include <google/protobuf/descriptor.h>
Y_UNIT_TEST_SUITE(ProtobufIsEqual) {
const ::google::protobuf::Descriptor* Descr = TSampleForIsEqual::descriptor();
diff --git a/library/cpp/protobuf/util/iterators.h b/library/cpp/protobuf/util/iterators.h
index e9fefea290..6d53ac71b1 100644
--- a/library/cpp/protobuf/util/iterators.h
+++ b/library/cpp/protobuf/util/iterators.h
@@ -1,6 +1,6 @@
#pragma once
-#include <google/protobuf/descriptor.h>
+#include <google/protobuf/descriptor.h>
namespace NProtoBuf {
class TFieldsIterator {
diff --git a/library/cpp/protobuf/util/merge.cpp b/library/cpp/protobuf/util/merge.cpp
index 67e404c3fc..dc2b9cc806 100644
--- a/library/cpp/protobuf/util/merge.cpp
+++ b/library/cpp/protobuf/util/merge.cpp
@@ -1,7 +1,7 @@
#include "merge.h"
#include "simple_reflection.h"
-#include <google/protobuf/message.h>
+#include <google/protobuf/message.h>
#include <library/cpp/protobuf/util/proto/merge.pb.h>
diff --git a/library/cpp/protobuf/util/path.h b/library/cpp/protobuf/util/path.h
index 7c04fafec2..487f643a2d 100644
--- a/library/cpp/protobuf/util/path.h
+++ b/library/cpp/protobuf/util/path.h
@@ -1,7 +1,7 @@
#pragma once
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
#include <util/generic/vector.h>
diff --git a/library/cpp/protobuf/util/pb_io.cpp b/library/cpp/protobuf/util/pb_io.cpp
index 8e451e955b..6270ee0624 100644
--- a/library/cpp/protobuf/util/pb_io.cpp
+++ b/library/cpp/protobuf/util/pb_io.cpp
@@ -3,9 +3,9 @@
#include <library/cpp/binsaver/bin_saver.h>
#include <library/cpp/string_utils/base64/base64.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/messagext.h>
-#include <google/protobuf/text_format.h>
+#include <google/protobuf/message.h>
+#include <google/protobuf/messagext.h>
+#include <google/protobuf/text_format.h>
#include <util/generic/string.h>
#include <util/stream/file.h>
@@ -85,9 +85,9 @@ int operator&(NProtoBuf::Message& m, IBinSaver& f) {
TStringStream ss;
if (f.IsReading()) {
f.Add(0, &ss.Str());
- m.ParseFromArcadiaStream(&ss);
+ m.ParseFromArcadiaStream(&ss);
} else {
- m.SerializeToArcadiaStream(&ss);
+ m.SerializeToArcadiaStream(&ss);
f.Add(0, &ss.Str());
}
return 0;
diff --git a/library/cpp/protobuf/util/repeated_field_utils.h b/library/cpp/protobuf/util/repeated_field_utils.h
index 163b18ef94..c07bd84647 100644
--- a/library/cpp/protobuf/util/repeated_field_utils.h
+++ b/library/cpp/protobuf/util/repeated_field_utils.h
@@ -1,6 +1,6 @@
#pragma once
-#include <google/protobuf/repeated_field.h>
+#include <google/protobuf/repeated_field.h>
#include <util/generic/vector.h>
template <typename T>
diff --git a/library/cpp/protobuf/util/simple_reflection.h b/library/cpp/protobuf/util/simple_reflection.h
index 4424424c80..61e877a787 100644
--- a/library/cpp/protobuf/util/simple_reflection.h
+++ b/library/cpp/protobuf/util/simple_reflection.h
@@ -4,8 +4,8 @@
#include "path.h"
#include "traits.h"
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
#include <util/generic/maybe.h>
#include <util/generic/typetraits.h>
diff --git a/library/cpp/protobuf/util/sort.h b/library/cpp/protobuf/util/sort.h
index ee1cf89a52..985ba6f689 100644
--- a/library/cpp/protobuf/util/sort.h
+++ b/library/cpp/protobuf/util/sort.h
@@ -1,6 +1,6 @@
#pragma once
-#include <google/protobuf/message.h>
+#include <google/protobuf/message.h>
#include <util/generic/vector.h>
#include <util/generic/algorithm.h>
diff --git a/library/cpp/protobuf/util/traits.h b/library/cpp/protobuf/util/traits.h
index b14aefb419..50f036d0ea 100644
--- a/library/cpp/protobuf/util/traits.h
+++ b/library/cpp/protobuf/util/traits.h
@@ -2,8 +2,8 @@
#include <util/generic/typetraits.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
namespace NProtoBuf {
// this nasty windows.h macro interfers with protobuf::Reflection::GetMessage()
diff --git a/library/cpp/protobuf/util/walk.h b/library/cpp/protobuf/util/walk.h
index 5c9d133707..d15d76562d 100644
--- a/library/cpp/protobuf/util/walk.h
+++ b/library/cpp/protobuf/util/walk.h
@@ -2,8 +2,8 @@
#include "simple_reflection.h"
-#include <google/protobuf/message.h>
-#include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
+#include <google/protobuf/descriptor.h>
#include <functional>
diff --git a/library/cpp/protobuf/ya.make b/library/cpp/protobuf/ya.make
index 3853aee77d..618b542b4f 100644
--- a/library/cpp/protobuf/ya.make
+++ b/library/cpp/protobuf/ya.make
@@ -14,6 +14,6 @@ RECURSE(
util/proto
yql
yql/ut
- yandex_patches_ut
+ yandex_patches_ut
yt
)