diff options
| author | i-sokolov <[email protected]> | 2022-02-10 16:46:30 +0300 | 
|---|---|---|
| committer | Daniil Cherednik <[email protected]> | 2022-02-10 16:46:30 +0300 | 
| commit | 7597bb840e100a7acf04459a48562c75b439f467 (patch) | |
| tree | 1a2c5ffcf89eb53ecd79dbc9bc0a195c27404d0c | |
| parent | 12c01f0701d50bc3f68eb36add9bff803ca94f35 (diff) | |
Restoring authorship annotation for <[email protected]>. Commit 2 of 2.
| -rw-r--r-- | contrib/libs/ya.make | 2 | ||||
| -rw-r--r-- | contrib/restricted/boost/boost/asio/detail/timer_queue.hpp | 4 | ||||
| -rw-r--r-- | library/cpp/xml/document/node-attr.h | 8 | ||||
| -rw-r--r-- | library/cpp/xml/document/xml-document-decl.h | 4 | ||||
| -rw-r--r-- | library/cpp/xml/document/xml-document.cpp | 18 | ||||
| -rw-r--r-- | library/cpp/xml/document/xml-document_ut.cpp | 24 | 
6 files changed, 30 insertions, 30 deletions
| diff --git a/contrib/libs/ya.make b/contrib/libs/ya.make index f9b365a3592..9c4640fdcf2 100644 --- a/contrib/libs/ya.make +++ b/contrib/libs/ya.make @@ -151,7 +151,7 @@ RECURSE(      libfuzzer12      libgeotiff      libgit2 -    libgraphqlparser  +    libgraphqlparser      libheif      libical      libiconv diff --git a/contrib/restricted/boost/boost/asio/detail/timer_queue.hpp b/contrib/restricted/boost/boost/asio/detail/timer_queue.hpp index ef63815430d..3b2bcff7744 100644 --- a/contrib/restricted/boost/boost/asio/detail/timer_queue.hpp +++ b/contrib/restricted/boost/boost/asio/detail/timer_queue.hpp @@ -267,13 +267,13 @@ private:      {        if (index == heap_.size() - 1)        { -        timer.heap_index_ = (std::numeric_limits<std::size_t>::max)();  +        timer.heap_index_ = (std::numeric_limits<std::size_t>::max)();          heap_.pop_back();        }        else        {          swap_heap(index, heap_.size() - 1); -        timer.heap_index_ = (std::numeric_limits<std::size_t>::max)();  +        timer.heap_index_ = (std::numeric_limits<std::size_t>::max)();          heap_.pop_back();          if (index > 0 && Time_Traits::less_than(                heap_[index].time_, heap_[(index - 1) / 2].time_)) diff --git a/library/cpp/xml/document/node-attr.h b/library/cpp/xml/document/node-attr.h index 3b757796bdd..6e74403943c 100644 --- a/library/cpp/xml/document/node-attr.h +++ b/library/cpp/xml/document/node-attr.h @@ -136,14 +136,14 @@ namespace NXml {      inline void TNode::SetAttr(TZtStringBuf name) {          xmlAttr* attr = xmlSetProp(NodePointer, XMLCHAR(name.c_str()), nullptr); -  +          if (!attr) {              THROW(XmlException, "Can't set node empty attribute <"                                      << name                                      << ">"); -        }  -    }  -  +        } +    } +      inline void TNode::DelAttr(TZtStringBuf name) {          if (xmlUnsetProp(NodePointer, XMLCHAR(name.c_str())) < 0)              THROW(XmlException, "Can't delete node attribute <" diff --git a/library/cpp/xml/document/xml-document-decl.h b/library/cpp/xml/document/xml-document-decl.h index 3ff972208ce..bfda1fb7e6e 100644 --- a/library/cpp/xml/document/xml-document-decl.h +++ b/library/cpp/xml/document/xml-document-decl.h @@ -388,7 +388,7 @@ namespace NXml {          SetAttr(TZtStringBuf name, const T& value);          void SetAttr(TZtStringBuf name, TZtStringBuf value); -  +          void SetAttr(TZtStringBuf name);          /** @@ -469,7 +469,7 @@ namespace NXml {          void AttrInternal(TCharPtr& value, T& res, TStringBuf errContext) const;          void SaveInternal(IOutputStream& stream, TZtStringBuf enc, int options) const; -  +          xmlNode* NodePointer;          xmlDoc* DocPointer;      }; diff --git a/library/cpp/xml/document/xml-document.cpp b/library/cpp/xml/document/xml-document.cpp index 562269473df..18a554d7321 100644 --- a/library/cpp/xml/document/xml-document.cpp +++ b/library/cpp/xml/document/xml-document.cpp @@ -316,21 +316,21 @@ namespace NXml {      void TNode::SaveInternal(IOutputStream& stream, TZtStringBuf enc, int options) const {          const char* encoding = enc.size() ? enc.data() : "utf-8";          TSaveCtxtPtr ctx(xmlSaveToIO(XmlWriteToOstream, /* close */ nullptr, &stream, -                                     encoding, options));  +                                     encoding, options));          if (xmlSaveTree(ctx.Get(), (xmlNode*)GetPtr()) < 0)              THROW(XmlException, "Failed saving node to stream");      }      void TNode::Save(IOutputStream& stream, TZtStringBuf enc, bool shouldFormat) const { -        SaveInternal(stream, enc, shouldFormat ? XML_SAVE_FORMAT : 0);  -    }  -  +        SaveInternal(stream, enc, shouldFormat ? XML_SAVE_FORMAT : 0); +    } +      void TNode::SaveAsHtml(IOutputStream& stream, TZtStringBuf enc, bool shouldFormat) const { -        int options = XML_SAVE_AS_HTML;  -        options |= shouldFormat ? XML_SAVE_FORMAT : 0;  -        SaveInternal(stream, enc, options);  -    }  -  +        int options = XML_SAVE_AS_HTML; +        options |= shouldFormat ? XML_SAVE_FORMAT : 0; +        SaveInternal(stream, enc, options); +    } +      TConstNodes::TConstNodes(const TConstNodes& nodes)          : SizeValue(nodes.Size())          , Doc(nodes.Doc) diff --git a/library/cpp/xml/document/xml-document_ut.cpp b/library/cpp/xml/document/xml-document_ut.cpp index 1dc6adf4e95..9f537b75c4c 100644 --- a/library/cpp/xml/document/xml-document_ut.cpp +++ b/library/cpp/xml/document/xml-document_ut.cpp @@ -278,19 +278,19 @@ Y_UNIT_TEST_SUITE(TestXmlDocument) {          UNIT_ASSERT_EQUAL(ys.Size(), 1);          UNIT_ASSERT_EQUAL(ys[0].Value<int>(), 20);      } -  +      Y_UNIT_TEST(Html) { -        using namespace NXml;  -  -        TDocument htmlChunk("video", TDocument::RootName);  -        TNode videoNode = htmlChunk.Root();  -  -        videoNode.SetAttr("controls");  -  -        TStringStream ss;  -        videoNode.SaveAsHtml(ss);  -        UNIT_ASSERT_EQUAL(ss.Str(), "<video controls></video>");  -    }  +        using namespace NXml; + +        TDocument htmlChunk("video", TDocument::RootName); +        TNode videoNode = htmlChunk.Root(); + +        videoNode.SetAttr("controls"); + +        TStringStream ss; +        videoNode.SaveAsHtml(ss); +        UNIT_ASSERT_EQUAL(ss.Str(), "<video controls></video>"); +    }      Y_UNIT_TEST(Move) {          using namespace NXml; | 
