From 9df28b520d67b0be9685effe76e1c6dde975e013 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andrei@andy314.com>
Date: Tue, 8 Dec 2020 09:25:40 -0500
Subject: [PATCH] Fix build: references to bufbound replaced with bufferwriter
 (#4120)

---
 src/lib/mdns/minimal/Parser.cpp        | 6 +++---
 src/lib/mdns/minimal/Parser.h          | 2 +-
 src/lib/mdns/minimal/ResponseBuilder.h | 2 +-
 src/lib/mdns/minimal/core/QName.h      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/mdns/minimal/Parser.cpp b/src/lib/mdns/minimal/Parser.cpp
index 170a950ae52cd3..b3ae34b98e2b6e 100644
--- a/src/lib/mdns/minimal/Parser.cpp
+++ b/src/lib/mdns/minimal/Parser.cpp
@@ -66,7 +66,7 @@ bool QueryData::Parse(const BytesRange & validData, const uint8_t ** start)
     return true;
 }
 
-bool QueryData::Append(HeaderRef & hdr, chip::BufBound & out) const
+bool QueryData::Append(HeaderRef & hdr, chip::Encoding::BigEndian::BufferWriter & out) const
 {
     if ((hdr.GetAdditionalCount() != 0) || (hdr.GetAnswerCount() != 0) || (hdr.GetAuthorityCount() != 0))
     {
@@ -74,8 +74,8 @@ bool QueryData::Append(HeaderRef & hdr, chip::BufBound & out) const
     }
 
     GetName().Put(out);
-    out.PutBE16(static_cast<uint16_t>(mType));
-    out.PutBE16(static_cast<uint16_t>(mClass) | (mAnswerViaUnicast ? kQClassUnicastAnswerFlag : 0));
+    out.Put16(static_cast<uint16_t>(mType));
+    out.Put16(static_cast<uint16_t>(mClass) | (mAnswerViaUnicast ? kQClassUnicastAnswerFlag : 0));
 
     if (out.Fit())
     {
diff --git a/src/lib/mdns/minimal/Parser.h b/src/lib/mdns/minimal/Parser.h
index 6e1ae622455b82..ef23d6c8e725d6 100644
--- a/src/lib/mdns/minimal/Parser.h
+++ b/src/lib/mdns/minimal/Parser.h
@@ -49,7 +49,7 @@ class QueryData
     bool Parse(const BytesRange & validData, const uint8_t ** start);
 
     /// Write out this query data back into an output buffer.
-    bool Append(HeaderRef & hdr, chip::BufBound & out) const;
+    bool Append(HeaderRef & hdr, chip::Encoding::BigEndian::BufferWriter & out) const;
 
 private:
     QType mType            = QType::ANY;
diff --git a/src/lib/mdns/minimal/ResponseBuilder.h b/src/lib/mdns/minimal/ResponseBuilder.h
index 1def167f5b8f0c..e583b703e9d862 100644
--- a/src/lib/mdns/minimal/ResponseBuilder.h
+++ b/src/lib/mdns/minimal/ResponseBuilder.h
@@ -97,7 +97,7 @@ class ResponseBuilder
             return *this;
         }
 
-        chip::BufBound out(mPacket->Start() + mPacket->DataLength(), mPacket->AvailableDataLength());
+        chip::Encoding::BigEndian::BufferWriter out(mPacket->Start() + mPacket->DataLength(), mPacket->AvailableDataLength());
 
         if (!query.Append(mHeader, out))
         {
diff --git a/src/lib/mdns/minimal/core/QName.h b/src/lib/mdns/minimal/core/QName.h
index 074c51b9190689..a0aeee53973380 100644
--- a/src/lib/mdns/minimal/core/QName.h
+++ b/src/lib/mdns/minimal/core/QName.h
@@ -108,7 +108,7 @@ class SerializedQNameIterator
     bool operator==(const FullQName & other) const;
     bool operator!=(const FullQName & other) const { return !(*this == other); }
 
-    void Put(chip::BufBound & out) const
+    void Put(chip::Encoding::BigEndian::BufferWriter & out) const
     {
         SerializedQNameIterator copy = *this;
         while (copy.Next())