diff options
| author | akhropov <akhropov@yandex-team.ru> | 2022-02-10 16:46:32 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:32 +0300 |
| commit | 298c6da79f1d8f35089a67f463f0b541bec36d9b (patch) | |
| tree | 1a2c5ffcf89eb53ecd79dbc9bc0a195c27404d0c /library/cpp/protobuf/util | |
| parent | 00afc96e9c0298054b7386fa7fb9e3cc3d67b974 (diff) | |
| download | ydb-298c6da79f1d8f35089a67f463f0b541bec36d9b.tar.gz | |
Restoring authorship annotation for <akhropov@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/protobuf/util')
| -rw-r--r-- | library/cpp/protobuf/util/pb_io.cpp | 16 | ||||
| -rw-r--r-- | library/cpp/protobuf/util/pb_io.h | 12 | ||||
| -rw-r--r-- | library/cpp/protobuf/util/pb_utils.h | 8 | ||||
| -rw-r--r-- | library/cpp/protobuf/util/ya.make | 20 |
4 files changed, 28 insertions, 28 deletions
diff --git a/library/cpp/protobuf/util/pb_io.cpp b/library/cpp/protobuf/util/pb_io.cpp index d57effb114..6270ee0624 100644 --- a/library/cpp/protobuf/util/pb_io.cpp +++ b/library/cpp/protobuf/util/pb_io.cpp @@ -2,16 +2,16 @@ #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 <util/generic/string.h> #include <util/stream/file.h> #include <util/stream/str.h> #include <util/string/cast.h> - + namespace NProtoBuf { class TEnumIdValuePrinter : public google::protobuf::TextFormat::FastFieldValuePrinter { @@ -97,10 +97,10 @@ void SerializeToTextFormat(const NProtoBuf::Message& m, IOutputStream& out) { NProtoBuf::io::TCopyingOutputStreamAdaptor adaptor(&out); if (!NProtoBuf::TextFormat::Print(m, &adaptor)) { - ythrow yexception() << "SerializeToTextFormat failed on Print"; + ythrow yexception() << "SerializeToTextFormat failed on Print"; } -} - +} + void SerializeToTextFormat(const NProtoBuf::Message& m, const TString& fileName) { /* TUnbufferedFileOutput is unbuffered, but TCopyingOutputStreamAdaptor adds * a buffer on top of it. */ @@ -167,8 +167,8 @@ bool TryParseFromTextFormat(const TString& fileName, NProtoBuf::Message& m, } return true; -} - +} + bool TryParseFromTextFormat(IInputStream& in, NProtoBuf::Message& m, const EParseFromTextFormatOptions options) { try { diff --git a/library/cpp/protobuf/util/pb_io.h b/library/cpp/protobuf/util/pb_io.h index b265a13cf3..493c84cb5f 100644 --- a/library/cpp/protobuf/util/pb_io.h +++ b/library/cpp/protobuf/util/pb_io.h @@ -1,8 +1,8 @@ -#pragma once - +#pragma once + #include <util/generic/fwd.h> #include <util/generic/flags.h> - + struct IBinSaver; namespace google { @@ -10,11 +10,11 @@ namespace google { class Message; } } - + namespace NProtoBuf { using Message = ::google::protobuf::Message; } - + class IInputStream; class IOutputStream; @@ -69,7 +69,7 @@ void ParseFromTextFormat(const TString& fileName, NProtoBuf::Message& m, // NOTE: will read `in` till the end. void ParseFromTextFormat(IInputStream& in, NProtoBuf::Message& m, const EParseFromTextFormatOptions options = {}); - + /* @return `true` if parsing was successfull and `false` otherwise. * * @see `ParseFromTextFormat` diff --git a/library/cpp/protobuf/util/pb_utils.h b/library/cpp/protobuf/util/pb_utils.h index 83fe0af167..9e9a110b48 100644 --- a/library/cpp/protobuf/util/pb_utils.h +++ b/library/cpp/protobuf/util/pb_utils.h @@ -1,10 +1,10 @@ -#pragma once - -#define UPDATE_PB_FIELD_MAX(PBMESS, FIELD, VAL) \ +#pragma once + +#define UPDATE_PB_FIELD_MAX(PBMESS, FIELD, VAL) \ if ((VAL) > (PBMESS).Get##FIELD()) { \ (PBMESS).Set##FIELD(VAL); \ } - + #define UPDATE_OPT_PB_FIELD_MAX(PBMESS, FIELD, VAL) \ if (!(PBMESS).Has##FIELD() || ((VAL) > (PBMESS).Get##FIELD())) { \ (PBMESS).Set##FIELD(VAL); \ diff --git a/library/cpp/protobuf/util/ya.make b/library/cpp/protobuf/util/ya.make index 9d267d435f..b62028af58 100644 --- a/library/cpp/protobuf/util/ya.make +++ b/library/cpp/protobuf/util/ya.make @@ -1,26 +1,26 @@ LIBRARY() - + OWNER(mowgli) -PEERDIR( - contrib/libs/protobuf +PEERDIR( + contrib/libs/protobuf library/cpp/binsaver library/cpp/protobuf/util/proto library/cpp/string_utils/base64 -) - -SRCS( +) + +SRCS( is_equal.cpp iterators.h merge.cpp path.cpp pb_io.cpp - pb_utils.h + pb_utils.h repeated_field_utils.h simple_reflection.cpp walk.cpp -) - -END() +) + +END() RECURSE_FOR_TESTS(ut) |