diff options
author | vdf <vdf@yandex-team.ru> | 2022-02-10 16:48:43 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:48:43 +0300 |
commit | b74c16abd264d7a738bce3733832ce988b28efc4 (patch) | |
tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 | |
parent | c52fa3470f4973c134b3c09a16dcdc7167eaece3 (diff) | |
download | ydb-b74c16abd264d7a738bce3733832ce988b28efc4.tar.gz |
Restoring authorship annotation for <vdf@yandex-team.ru>. Commit 2 of 2.
-rw-r--r-- | contrib/python/ya.make | 4 | ||||
-rw-r--r-- | library/cpp/protobuf/util/pb_io.cpp | 10 | ||||
-rw-r--r-- | library/cpp/protobuf/util/pb_io.h | 2 | ||||
-rw-r--r-- | library/cpp/protobuf/util/pb_io_ut.cpp | 4 | ||||
-rw-r--r-- | util/generic/algorithm.h | 10 |
5 files changed, 15 insertions, 15 deletions
diff --git a/contrib/python/ya.make b/contrib/python/ya.make index 64862785e4..d01ced9f3a 100644 --- a/contrib/python/ya.make +++ b/contrib/python/ya.make @@ -499,7 +499,7 @@ RECURSE( hypercorn hyperframe hyperlink - hyperopt + hyperopt hypothesis ibm-db icalendar @@ -1039,7 +1039,7 @@ RECURSE( StrEnum structlog subprocess32 - subword-nmt + subword-nmt suds-jurko supervenn supervisor diff --git a/library/cpp/protobuf/util/pb_io.cpp b/library/cpp/protobuf/util/pb_io.cpp index 6ed26e553e..6270ee0624 100644 --- a/library/cpp/protobuf/util/pb_io.cpp +++ b/library/cpp/protobuf/util/pb_io.cpp @@ -43,14 +43,14 @@ namespace NProtoBuf { } Base64EncodeUrl(rawData, dataBase64); - } + } TString SerializeToBase64String(const Message& m) { TString s; SerializeToBase64String(m, s); return s; - } - + } + bool TrySerializeToBase64String(const Message& m, TString& dataBase64) { try { SerializeToBase64String(m, dataBase64); @@ -67,8 +67,8 @@ namespace NProtoBuf { TString result; printer.PrintToString(message, &result); return result; - } - + } + bool MergePartialFromString(NProtoBuf::Message& m, const TStringBuf serializedProtoMessage) { google::protobuf::io::CodedInputStream input(reinterpret_cast<const ui8*>(serializedProtoMessage.data()), serializedProtoMessage.size()); bool ok = m.MergePartialFromCodedStream(&input); diff --git a/library/cpp/protobuf/util/pb_io.h b/library/cpp/protobuf/util/pb_io.h index 0ebe8ccb6c..493c84cb5f 100644 --- a/library/cpp/protobuf/util/pb_io.h +++ b/library/cpp/protobuf/util/pb_io.h @@ -29,7 +29,7 @@ namespace NProtoBuf { ParseFromBase64String(dataBase64, m, allowUneven); return m; } - + /* Serialize message into string and apply base64 URL encoding. */ TString SerializeToBase64String(const Message& m); diff --git a/library/cpp/protobuf/util/pb_io_ut.cpp b/library/cpp/protobuf/util/pb_io_ut.cpp index 21d7596b82..875d6dc602 100644 --- a/library/cpp/protobuf/util/pb_io_ut.cpp +++ b/library/cpp/protobuf/util/pb_io_ut.cpp @@ -44,11 +44,11 @@ static const TString INCORRECT_ENUM_ID_MESSAGE = )"; static const TString CORRECT_BASE64_MESSAGE = "CCo,"; - + static const TString CORRECT_UNEVEN_BASE64_MESSAGE = "CCo"; static const TString INCORRECT_BASE64_MESSAGE = "CC"; - + Y_UNIT_TEST_SUITE(TTestProtoBufIO) { Y_UNIT_TEST(TestBase64) { { diff --git a/util/generic/algorithm.h b/util/generic/algorithm.h index 896d57572e..badfb88993 100644 --- a/util/generic/algorithm.h +++ b/util/generic/algorithm.h @@ -477,11 +477,11 @@ Val Accumulate(const C& c, Val val, BinOp binOp) { return Accumulate(std::begin(c), std::end(c), std::move(val), binOp); } -template <typename It1, typename It2, typename Val> -static inline Val InnerProduct(It1 begin1, It1 end1, It2 begin2, Val val) { - return std::inner_product(begin1, end1, begin2, val); -} - +template <typename It1, typename It2, typename Val> +static inline Val InnerProduct(It1 begin1, It1 end1, It2 begin2, Val val) { + return std::inner_product(begin1, end1, begin2, val); +} + template <typename It1, typename It2, typename Val, typename BinOp1, typename BinOp2> static inline Val InnerProduct(It1 begin1, It1 end1, It2 begin2, Val val, BinOp1 binOp1, BinOp2 binOp2) { return std::inner_product(begin1, end1, begin2, val, binOp1, binOp2); |