aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp/protobuf/util/merge.h
diff options
context:
space:
mode:
authormowgli <mowgli@yandex-team.ru>2022-02-10 16:49:25 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:49:25 +0300
commit89afbbe4ca0e02e386dd4df08f7945f190dc1b84 (patch)
treec4772201af6215d48734691b8796e4cfc77c2ac8 /library/cpp/protobuf/util/merge.h
parent7510cec1516d17cbc8d7749974e36aa45f547a26 (diff)
downloadydb-89afbbe4ca0e02e386dd4df08f7945f190dc1b84.tar.gz
Restoring authorship annotation for <mowgli@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/protobuf/util/merge.h')
-rw-r--r--library/cpp/protobuf/util/merge.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/library/cpp/protobuf/util/merge.h b/library/cpp/protobuf/util/merge.h
index 924975f141..847b65dd0e 100644
--- a/library/cpp/protobuf/util/merge.h
+++ b/library/cpp/protobuf/util/merge.h
@@ -1,22 +1,22 @@
-#pragma once
-
+#pragma once
+
namespace google {
namespace protobuf {
class Message;
}
}
-
+
namespace NProtoBuf {
using Message = ::google::protobuf::Message;
}
-
-namespace NProtoBuf {
+
+namespace NProtoBuf {
// Similiar to Message::MergeFrom, overwrites existing repeated fields
// and embedded messages completely instead of recursive merging.
void RewriteMerge(const Message& src, Message& dst);
-
+
// Does standard MergeFrom() by default, except messages/fields marked with DontMerge or DontMergeField option.
// Such fields are merged using RewriteMerge() (i.e. destination is cleared before merging anything from source)
void CustomMerge(const Message& src, Message& dst);
-
+
}