diff options
author | udovichenko-r <udovichenko-r@yandex-team.ru> | 2022-02-10 16:49:21 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:49:21 +0300 |
commit | d7e4eaec9d325e188dabb3eb1949a32a5229e9ce (patch) | |
tree | 75f143caa4e1e35b760846b22310ede3212d7f63 /library | |
parent | 027f7b7f6644e258a5840869b9b82c79e1ebeee0 (diff) | |
download | ydb-d7e4eaec9d325e188dabb3eb1949a32a5229e9ce.tar.gz |
Restoring authorship annotation for <udovichenko-r@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'library')
-rw-r--r-- | library/cpp/binsaver/bin_saver.h | 52 | ||||
-rw-r--r-- | library/cpp/codecs/codecs_registry.cpp | 4 | ||||
-rw-r--r-- | library/cpp/codecs/solar_codec.h | 54 | ||||
-rw-r--r-- | library/cpp/codecs/ut/codecs_ut.cpp | 12 | ||||
-rw-r--r-- | library/cpp/containers/comptrie/comptrie_impl.h | 60 | ||||
-rw-r--r-- | library/cpp/containers/comptrie/comptrie_trie.h | 46 | ||||
-rw-r--r-- | library/cpp/containers/comptrie/comptrie_ut.cpp | 116 | ||||
-rw-r--r-- | library/cpp/containers/comptrie/protopacker.h | 2 | ||||
-rw-r--r-- | library/cpp/containers/sorted_vector/ut/ya.make | 2 | ||||
-rw-r--r-- | library/cpp/containers/ya.make | 4 | ||||
-rw-r--r-- | library/cpp/ya.make | 10 | ||||
-rw-r--r-- | library/cpp/yson/node/node.cpp | 6 | ||||
-rw-r--r-- | library/cpp/yson/writer.cpp | 2 | ||||
-rw-r--r-- | library/cpp/yson/writer.h | 2 |
14 files changed, 186 insertions, 186 deletions
diff --git a/library/cpp/binsaver/bin_saver.h b/library/cpp/binsaver/bin_saver.h index 412424889f..f9938cc074 100644 --- a/library/cpp/binsaver/bin_saver.h +++ b/library/cpp/binsaver/bin_saver.h @@ -9,7 +9,7 @@ #include <util/generic/buffer.h> #include <util/generic/list.h> #include <util/generic/maybe.h> -#include <util/generic/bitmap.h> +#include <util/generic/bitmap.h> #include <util/generic/variant.h> #include <util/generic/ylimits.h> #include <util/memory/blob.h> @@ -426,31 +426,31 @@ public: } int Add(const chunk_id, TDynBitMap* pData) { - if (IsReading()) { - ui64 count = 0; - Add(1, &count); - pData->Clear(); - pData->Reserve(count * sizeof(TDynBitMap::TChunk) * 8); - for (ui64 i = 0; i < count; ++i) { - TDynBitMap::TChunk chunk = 0; - Add(i + 1, &chunk); - if (i > 0) { - pData->LShift(8 * sizeof(TDynBitMap::TChunk)); - } - pData->Or(chunk); - } - } else { - ui64 count = pData->GetChunkCount(); - Add(1, &count); - for (ui64 i = 0; i < count; ++i) { - // Write in reverse order - TDynBitMap::TChunk chunk = pData->GetChunks()[count - i - 1]; - Add(i + 1, &chunk); - } - } - return 0; - } - + if (IsReading()) { + ui64 count = 0; + Add(1, &count); + pData->Clear(); + pData->Reserve(count * sizeof(TDynBitMap::TChunk) * 8); + for (ui64 i = 0; i < count; ++i) { + TDynBitMap::TChunk chunk = 0; + Add(i + 1, &chunk); + if (i > 0) { + pData->LShift(8 * sizeof(TDynBitMap::TChunk)); + } + pData->Or(chunk); + } + } else { + ui64 count = pData->GetChunkCount(); + Add(1, &count); + for (ui64 i = 0; i < count; ++i) { + // Write in reverse order + TDynBitMap::TChunk chunk = pData->GetChunks()[count - i - 1]; + Add(i + 1, &chunk); + } + } + return 0; + } + template <class TVariantClass> struct TLoadFromTypeFromListHelper { template <class T0, class... TTail> diff --git a/library/cpp/codecs/codecs_registry.cpp b/library/cpp/codecs/codecs_registry.cpp index 17d07062ab..bfc145bade 100644 --- a/library/cpp/codecs/codecs_registry.cpp +++ b/library/cpp/codecs/codecs_registry.cpp @@ -27,8 +27,8 @@ namespace NCodecs { Y_VERIFY(!Registry.contains(name), "already has %s", name.data()); Registry[name] = fac; } - } - + } + TCodecPtr TCodecRegistry::GetCodec(TStringBuf name) const { using namespace NPrivate; diff --git a/library/cpp/codecs/solar_codec.h b/library/cpp/codecs/solar_codec.h index 7158ae7926..f0093f82f9 100644 --- a/library/cpp/codecs/solar_codec.h +++ b/library/cpp/codecs/solar_codec.h @@ -13,15 +13,15 @@ namespace NCodecs { struct TVarIntTraits { static const size_t MAX_VARINT32_BYTES = 5; - + static void Write(ui32 value, TBuffer& b) { while (value > 0x7F) { b.Append(static_cast<ui8>(value) | 0x80); value >>= 7; } b.Append(static_cast<ui8>(value) & 0x7F); - } - + } + static void Read(TStringBuf& r, ui32& value) { ui32 result = 0; for (ui32 count = 0; count < MAX_VARINT32_BYTES; ++count) { @@ -34,22 +34,22 @@ namespace NCodecs { } else if (Y_UNLIKELY(r.empty())) { break; } - } + } Y_ENSURE_EX(false, TCodecException() << "Bad data"); - } + } }; - + struct TShortIntTraits { static const size_t SHORTINT_SIZE_LIMIT = 0x8000; - + Y_FORCE_INLINE static void Write(ui32 value, TBuffer& b) { Y_ENSURE_EX(value < SHORTINT_SIZE_LIMIT, TCodecException() << "Bad write method"); if (value >= 0x80) { b.Append(static_cast<ui8>(value >> 8) | 0x80); } b.Append(static_cast<ui8>(value)); - } - + } + Y_FORCE_INLINE static void Read(TStringBuf& r, ui32& value) { ui32 result = static_cast<ui8>(r[0]); r.Skip(1); @@ -59,9 +59,9 @@ namespace NCodecs { r.Skip(1); } value = result; - } + } }; - + class TSolarCodec: public ICodec { public: static TStringBuf MyName8k() { @@ -115,28 +115,28 @@ namespace NCodecs { EncodeImpl<TVarIntTraits>(r, b); return 0; } - + void Decode(TStringBuf r, TBuffer& b) const override { DecodeImpl<TVarIntTraits>(r, b); } - + TString GetName() const override { return ToString(MyName()); } - + protected: void DoLearn(ISequenceReader&) override; void Save(IOutputStream*) const override; void Load(IInputStream*) override; - + Y_FORCE_INLINE TStringBuf SubStr(ui32 begoff, ui32 endoff) const { return TStringBuf(Pool.Data() + begoff, endoff - begoff); } - + Y_FORCE_INLINE TStringBuf DoDecode(ui32 num) const { return SubStr(Decoder[num - 1], Decoder[num]); } - + template <class TTraits> Y_FORCE_INLINE void EncodeImpl(TStringBuf r, TBuffer& b) const { b.Clear(); @@ -195,8 +195,8 @@ namespace NCodecs { } return 0; - } - + } + void Decode(TStringBuf r, TBuffer& b) const override { if (CanUseShortInt()) { DecodeImpl<TShortIntTraits>(r, b); @@ -204,23 +204,23 @@ namespace NCodecs { DecodeImpl<TVarIntTraits>(r, b); } } - + TString GetName() const override { if (CanUseShortInt()) { return ToString(MyNameShortInt()); } else { return ToString(MyName()); } - } + } }; - + class TSolarCodecShortInt: public TSolarCodec { public: explicit TSolarCodecShortInt(ui32 maxentries = 1 << 14, ui32 maxiter = 16, const NGreedyDict::TBuildSettings& s = NGreedyDict::TBuildSettings()) : TSolarCodec(maxentries, maxiter, s) { - } - + } + ui8 /*free bits in last byte*/ Encode(TStringBuf r, TBuffer& b) const override { EncodeImpl<TShortIntTraits>(r, b); return 0; @@ -229,16 +229,16 @@ namespace NCodecs { void Decode(TStringBuf r, TBuffer& b) const override { DecodeImpl<TShortIntTraits>(r, b); } - + TString GetName() const override { return ToString(MyNameShortInt()); } - + protected: void Load(IInputStream* in) override { TSolarCodec::Load(in); Y_ENSURE_EX(CanUseShortInt(), TCodecException() << "Bad data"); } }; - + } diff --git a/library/cpp/codecs/ut/codecs_ut.cpp b/library/cpp/codecs/ut/codecs_ut.cpp index caf6089aef..4bebbad08f 100644 --- a/library/cpp/codecs/ut/codecs_ut.cpp +++ b/library/cpp/codecs/ut/codecs_ut.cpp @@ -1281,9 +1281,9 @@ private: } TestCodec<TSolarCodec, true>(learn, test, new TSolarCodec(512, 8)); - TestCodec<TAdaptiveSolarCodec, false>(learn, test, new TAdaptiveSolarCodec(512, 8)); - TestCodec<TAdaptiveSolarCodec, true>(learn, test, new TAdaptiveSolarCodec(512, 8)); - TestCodec<TSolarCodecShortInt, true>(learn, test, new TSolarCodecShortInt(512, 8)); + TestCodec<TAdaptiveSolarCodec, false>(learn, test, new TAdaptiveSolarCodec(512, 8)); + TestCodec<TAdaptiveSolarCodec, true>(learn, test, new TAdaptiveSolarCodec(512, 8)); + TestCodec<TSolarCodecShortInt, true>(learn, test, new TSolarCodecShortInt(512, 8)); } { @@ -1302,9 +1302,9 @@ private: } TestCodec<TSolarCodec, true>(learn, test, new TSolarCodec(512, 8)); - TestCodec<TAdaptiveSolarCodec, false>(learn, test, new TAdaptiveSolarCodec(512, 8)); - TestCodec<TAdaptiveSolarCodec, true>(learn, test, new TAdaptiveSolarCodec(512, 8)); - TestCodec<TSolarCodecShortInt, true>(learn, test, new TSolarCodecShortInt(512, 8)); + TestCodec<TAdaptiveSolarCodec, false>(learn, test, new TAdaptiveSolarCodec(512, 8)); + TestCodec<TAdaptiveSolarCodec, true>(learn, test, new TAdaptiveSolarCodec(512, 8)); + TestCodec<TSolarCodecShortInt, true>(learn, test, new TSolarCodecShortInt(512, 8)); } } diff --git a/library/cpp/containers/comptrie/comptrie_impl.h b/library/cpp/containers/comptrie/comptrie_impl.h index f41c38311a..068bed2e6c 100644 --- a/library/cpp/containers/comptrie/comptrie_impl.h +++ b/library/cpp/containers/comptrie/comptrie_impl.h @@ -182,40 +182,40 @@ namespace NCompactTrie { // If there is a value associated with the symbol, makes the value pointer point to it, // otherwise sets it to nullptr. // Returns true if the symbol was succesfully found in the trie, false otherwise. - template <typename TSymbol, class TPacker> + template <typename TSymbol, class TPacker> Y_FORCE_INLINE bool Advance(const char*& datapos, const char* const dataend, const char*& value, TSymbol label, TPacker packer) { Y_ASSERT(datapos < dataend); - char flags = MT_NEXT; - for (int i = (int)ExtraBits<TSymbol>(); i >= 0; i -= 8) { - flags = LeapByte(datapos, dataend, (char)(label >> i)); - if (!datapos) { - return false; // no such arc - } - + char flags = MT_NEXT; + for (int i = (int)ExtraBits<TSymbol>(); i >= 0; i -= 8) { + flags = LeapByte(datapos, dataend, (char)(label >> i)); + if (!datapos) { + return false; // no such arc + } + value = nullptr; - + Y_ASSERT(datapos <= dataend); - if ((flags & MT_FINAL)) { - value = datapos; - datapos += packer.SkipLeaf(datapos); - } - - if (!(flags & MT_NEXT)) { - if (i == 0) { + if ((flags & MT_FINAL)) { + value = datapos; + datapos += packer.SkipLeaf(datapos); + } + + if (!(flags & MT_NEXT)) { + if (i == 0) { datapos = nullptr; - return true; - } - return false; // no further way - } - - TraverseEpsilon(datapos); - if (i == 0) { // last byte, and got a match - return true; - } - } - - return false; - } - + return true; + } + return false; // no further way + } + + TraverseEpsilon(datapos); + if (i == 0) { // last byte, and got a match + return true; + } + } + + return false; + } + } diff --git a/library/cpp/containers/comptrie/comptrie_trie.h b/library/cpp/containers/comptrie/comptrie_trie.h index 40ec1e52b3..ffba10ae40 100644 --- a/library/cpp/containers/comptrie/comptrie_trie.h +++ b/library/cpp/containers/comptrie/comptrie_trie.h @@ -139,7 +139,7 @@ public: // same as FindTails(&key, 1), a bit faster // return false, if no arc with @label exists - inline bool FindTails(TSymbol label, TCompactTrie<T, D, S>& res) const; + inline bool FindTails(TSymbol label, TCompactTrie<T, D, S>& res) const; class TConstIterator { private: @@ -361,28 +361,28 @@ bool TCompactTrie<T, D, S>::FindTails(const TSymbol* key, size_t keylen, TCompac return true; } - const char* datastart = DataHolder.AsCharPtr(); - const char* datapos = datastart; - const char* const dataend = datapos + len; - + const char* datastart = DataHolder.AsCharPtr(); + const char* datapos = datastart; + const char* const dataend = datapos + len; + const TSymbol* keyend = key + keylen; const char* value = nullptr; - + while (key != keyend) { T label = *(key++); - if (!NCompactTrie::Advance(datapos, dataend, value, label, Packer)) - return false; + if (!NCompactTrie::Advance(datapos, dataend, value, label, Packer)) + return false; - if (key == keyend) { - if (datapos) { + if (key == keyend) { + if (datapos) { Y_ASSERT(datapos >= datastart); res = TCompactTrie<T, D, S>(TBlob::NoCopy(datapos, dataend - datapos), value); - } else { - res = TCompactTrie<T, D, S>(value); + } else { + res = TCompactTrie<T, D, S>(value); } - return true; - } else if (!datapos) { - return false; // No further way + return true; + } else if (!datapos) { + return false; // No further way } } @@ -390,7 +390,7 @@ bool TCompactTrie<T, D, S>::FindTails(const TSymbol* key, size_t keylen, TCompac } template <class T, class D, class S> -inline bool TCompactTrie<T, D, S>::FindTails(TSymbol label, TCompactTrie<T, D, S>& res) const { +inline bool TCompactTrie<T, D, S>::FindTails(TSymbol label, TCompactTrie<T, D, S>& res) const { using namespace NCompactTrie; const size_t len = DataHolder.Length(); @@ -402,17 +402,17 @@ inline bool TCompactTrie<T, D, S>::FindTails(TSymbol label, TCompactTrie<T, D, S const char* datapos = datastart; const char* value = nullptr; - if (!NCompactTrie::Advance(datapos, dataend, value, label, Packer)) - return false; + if (!NCompactTrie::Advance(datapos, dataend, value, label, Packer)) + return false; - if (datapos) { + if (datapos) { Y_ASSERT(datapos >= datastart); - res = TCompactTrie<T, D, S>(TBlob::NoCopy(datapos, dataend - datapos), value); - } else { - res = TCompactTrie<T, D, S>(value); + res = TCompactTrie<T, D, S>(TBlob::NoCopy(datapos, dataend - datapos), value); + } else { + res = TCompactTrie<T, D, S>(value); } - return true; + return true; } template <class T, class D, class S> diff --git a/library/cpp/containers/comptrie/comptrie_ut.cpp b/library/cpp/containers/comptrie/comptrie_ut.cpp index 74bee09b5d..ea7df5c59d 100644 --- a/library/cpp/containers/comptrie/comptrie_ut.cpp +++ b/library/cpp/containers/comptrie/comptrie_ut.cpp @@ -96,7 +96,7 @@ private: UNIT_TEST(TestSearchIterChar); UNIT_TEST(TestSearchIterWchar); UNIT_TEST(TestSearchIterWchar32) - + UNIT_TEST(TestCopyAndAssignment); UNIT_TEST(TestFirstSymbolIterator8); @@ -152,9 +152,9 @@ private: template <class TContainer> void TestTrieWithContainers(const TVector<TUtf16String>& keys, const TVector<TContainer>& sampleData, TString methodName); - template <typename TChar> - void TestSearchIterImpl(); - + template <typename TChar> + void TestSearchIterImpl(); + template <class TTrie> void TestFirstSymbolIteratorForTrie(const TTrie& trie, const TStringBuf& narrowAnswers); @@ -230,8 +230,8 @@ public: void TestEmptyValueOutOfOrder(); void TestFindLongestPrefixWithEmptyValue(); - void TestSearchIterChar(); - void TestSearchIterWchar(); + void TestSearchIterChar(); + void TestSearchIterWchar(); void TestSearchIterWchar32(); void TestCopyAndAssignment(); @@ -1292,21 +1292,21 @@ void TCompactTrieTest::TestFindLongestPrefixWithEmptyValue() { UNIT_ASSERT(value == 31415); } } - -template <typename TChar> -struct TConvertKey { + +template <typename TChar> +struct TConvertKey { static inline TString Convert(const TStringBuf& key) { return ToString(key); - } -}; - -template <> -struct TConvertKey<wchar16> { + } +}; + +template <> +struct TConvertKey<wchar16> { static inline TUtf16String Convert(const TStringBuf& key) { - return UTF8ToWide(key); - } -}; - + return UTF8ToWide(key); + } +}; + template <> struct TConvertKey<wchar32> { static inline TUtf32String Convert(const TStringBuf& key) { @@ -1314,62 +1314,62 @@ struct TConvertKey<wchar32> { } }; -template <class TSearchIter, class TKeyBuf> -static void MoveIter(TSearchIter& iter, const TKeyBuf& key) { - for (size_t i = 0; i < key.length(); ++i) { - UNIT_ASSERT(iter.Advance(key[i])); - } -} - -template <typename TChar> -void TCompactTrieTest::TestSearchIterImpl() { - TBufferOutput buffer; - { - TCompactTrieBuilder<TChar, ui32> builder; - TStringBuf data[] = { +template <class TSearchIter, class TKeyBuf> +static void MoveIter(TSearchIter& iter, const TKeyBuf& key) { + for (size_t i = 0; i < key.length(); ++i) { + UNIT_ASSERT(iter.Advance(key[i])); + } +} + +template <typename TChar> +void TCompactTrieTest::TestSearchIterImpl() { + TBufferOutput buffer; + { + TCompactTrieBuilder<TChar, ui32> builder; + TStringBuf data[] = { TStringBuf("abaab"), TStringBuf("abcdef"), TStringBuf("abbbc"), TStringBuf("bdfaa"), - }; + }; for (size_t i = 0; i < Y_ARRAY_SIZE(data); ++i) { - builder.Add(TConvertKey<TChar>::Convert(data[i]), i + 1); - } - builder.Save(buffer); - } - - TCompactTrie<TChar, ui32> trie(buffer.Buffer().Data(), buffer.Buffer().Size()); - ui32 value = 0; + builder.Add(TConvertKey<TChar>::Convert(data[i]), i + 1); + } + builder.Save(buffer); + } + + TCompactTrie<TChar, ui32> trie(buffer.Buffer().Data(), buffer.Buffer().Size()); + ui32 value = 0; auto iter(MakeSearchIterator(trie)); MoveIter(iter, TConvertKey<TChar>::Convert(TStringBuf("abc"))); - UNIT_ASSERT(!iter.GetValue(&value)); - + UNIT_ASSERT(!iter.GetValue(&value)); + iter = MakeSearchIterator(trie); MoveIter(iter, TConvertKey<TChar>::Convert(TStringBuf("abbbc"))); - UNIT_ASSERT(iter.GetValue(&value)); - UNIT_ASSERT_EQUAL(value, 3); - + UNIT_ASSERT(iter.GetValue(&value)); + UNIT_ASSERT_EQUAL(value, 3); + iter = MakeSearchIterator(trie); UNIT_ASSERT(iter.Advance(TConvertKey<TChar>::Convert(TStringBuf("bdfa")))); - UNIT_ASSERT(!iter.GetValue(&value)); - + UNIT_ASSERT(!iter.GetValue(&value)); + iter = MakeSearchIterator(trie); UNIT_ASSERT(iter.Advance(TConvertKey<TChar>::Convert(TStringBuf("bdfaa")))); - UNIT_ASSERT(iter.GetValue(&value)); - UNIT_ASSERT_EQUAL(value, 4); - + UNIT_ASSERT(iter.GetValue(&value)); + UNIT_ASSERT_EQUAL(value, 4); + UNIT_ASSERT(!MakeSearchIterator(trie).Advance(TChar('z'))); UNIT_ASSERT(!MakeSearchIterator(trie).Advance(TConvertKey<TChar>::Convert(TStringBuf("cdf")))); UNIT_ASSERT(!MakeSearchIterator(trie).Advance(TConvertKey<TChar>::Convert(TStringBuf("abca")))); -} - -void TCompactTrieTest::TestSearchIterChar() { - TestSearchIterImpl<char>(); -} - -void TCompactTrieTest::TestSearchIterWchar() { - TestSearchIterImpl<wchar16>(); -} +} + +void TCompactTrieTest::TestSearchIterChar() { + TestSearchIterImpl<char>(); +} + +void TCompactTrieTest::TestSearchIterWchar() { + TestSearchIterImpl<wchar16>(); +} void TCompactTrieTest::TestSearchIterWchar32() { TestSearchIterImpl<wchar32>(); diff --git a/library/cpp/containers/comptrie/protopacker.h b/library/cpp/containers/comptrie/protopacker.h index 3e15866dc5..1e3785d5b7 100644 --- a/library/cpp/containers/comptrie/protopacker.h +++ b/library/cpp/containers/comptrie/protopacker.h @@ -1,6 +1,6 @@ #pragma once -#include <util/stream/mem.h> +#include <util/stream/mem.h> #include <util/ysaveload.h> template <class Proto> diff --git a/library/cpp/containers/sorted_vector/ut/ya.make b/library/cpp/containers/sorted_vector/ut/ya.make index eb8a5b4bef..bc7d72600f 100644 --- a/library/cpp/containers/sorted_vector/ut/ya.make +++ b/library/cpp/containers/sorted_vector/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/containers/sorted_vector) +UNITTEST_FOR(library/cpp/containers/sorted_vector) OWNER(udovichenko-r) diff --git a/library/cpp/containers/ya.make b/library/cpp/containers/ya.make index 4b1b315e6a..22d28fd753 100644 --- a/library/cpp/containers/ya.make +++ b/library/cpp/containers/ya.make @@ -54,8 +54,8 @@ RECURSE( safe_vector safe_vector/ut segmented_pool_container - sorted_vector - sorted_vector/ut + sorted_vector + sorted_vector/ut spars_ar stack_array stack_array/ut diff --git a/library/cpp/ya.make b/library/cpp/ya.make index 8c1193b007..68b374acaa 100644 --- a/library/cpp/ya.make +++ b/library/cpp/ya.make @@ -277,8 +277,8 @@ RECURSE( pop_count pop_count/benchmark pop_count/ut - presort - presort/ut + presort + presort/ut prob_counter prob_counter/ut progress_bar @@ -356,8 +356,8 @@ RECURSE( succinct_arrays succinct_arrays/ut svnversion - telfinder - telfinder/ut + telfinder + telfinder/ut terminate_handler terminate_handler/sample testing @@ -386,7 +386,7 @@ RECURSE( udp uilangdetect uilangdetect/ut - unicode + unicode unistat unistat/ut uri diff --git a/library/cpp/yson/node/node.cpp b/library/cpp/yson/node/node.cpp index b39e070718..c832447d3b 100644 --- a/library/cpp/yson/node/node.cpp +++ b/library/cpp/yson/node/node.cpp @@ -878,9 +878,9 @@ bool operator==(const TNode& lhs, const TNode& rhs) if (lhs.Attributes_) { if (rhs.Attributes_) { - if (*lhs.Attributes_ != *rhs.Attributes_) { - return false; - } + if (*lhs.Attributes_ != *rhs.Attributes_) { + return false; + } } else { return false; } diff --git a/library/cpp/yson/writer.cpp b/library/cpp/yson/writer.cpp index 054459f9f5..d1dc7c672e 100644 --- a/library/cpp/yson/writer.cpp +++ b/library/cpp/yson/writer.cpp @@ -341,7 +341,7 @@ namespace NYson { //////////////////////////////////////////////////////////////////////////////// void ReformatYsonStream( - IInputStream* input, + IInputStream* input, IOutputStream* output, EYsonFormat format, EYsonType type) { diff --git a/library/cpp/yson/writer.h b/library/cpp/yson/writer.h index 40f5d7d501..722ebe5e70 100644 --- a/library/cpp/yson/writer.h +++ b/library/cpp/yson/writer.h @@ -79,7 +79,7 @@ namespace NYson { //////////////////////////////////////////////////////////////////////////////// void ReformatYsonStream( - IInputStream* input, + IInputStream* input, IOutputStream* output, EYsonFormat format = EYsonFormat::Binary, EYsonType type = ::NYson::EYsonType::Node); |