From 551636500b210a302f1a868b889eb82b5c87c2ac Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Wed, 1 Sep 2021 11:35:53 +0200 Subject: SharedBuffer: MakeOwned now returns a buffer instead of operating in-place CL15713705 --- zencore/compactbinarypackage.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'zencore/compactbinarypackage.cpp') diff --git a/zencore/compactbinarypackage.cpp b/zencore/compactbinarypackage.cpp index 2d89bd342..411733a8c 100644 --- a/zencore/compactbinarypackage.cpp +++ b/zencore/compactbinarypackage.cpp @@ -45,9 +45,8 @@ CbAttachment::CbAttachment(CbFieldIterator InValue, const IoHash* const InHash) } } -CbAttachment::CbAttachment(SharedBuffer InBuffer, const IoHash* const InHash) : Buffer(std::move(InBuffer)) +CbAttachment::CbAttachment(SharedBuffer InBuffer, const IoHash* const InHash) : Buffer(std::move(InBuffer).MakeOwned()) { - Buffer.MakeOwned(); if (InHash) { Hash = *InHash; @@ -116,8 +115,7 @@ CbAttachment::TryLoad(CbFieldIterator& Fields) if (View.GetSize() > 0) { - Buffer = SharedBuffer::MakeView(View, Fields.GetOuterBuffer()); - Buffer.MakeOwned(); + Buffer = SharedBuffer::MakeView(View, Fields.GetOuterBuffer()).MakeOwned(); ++Fields; Hash = Fields.AsAttachment(); if (Fields.HasError()) @@ -152,8 +150,7 @@ CbAttachment::TryLoad(BinaryReader& Reader, BufferAllocator Allocator) } if (View.GetSize() > 0) { - Buffer = SharedBuffer::MakeView(View, BufferField.GetOuterBuffer()); - Buffer.MakeOwned(); + Buffer = SharedBuffer::MakeView(View, BufferField.GetOuterBuffer()).MakeOwned(); CompactBinary = CbFieldViewIterator(); std::vector HashBuffer; @@ -401,8 +398,7 @@ CbPackage::TryLoad(BinaryReader& Reader, BufferAllocator Allocator, AttachmentRe const MemoryView View = ValueField.AsBinaryView(); if (View.GetSize() > 0) { - SharedBuffer Buffer = SharedBuffer::MakeView(View, ValueField.GetOuterBuffer()); - Buffer.MakeOwned(); + SharedBuffer Buffer = SharedBuffer::MakeView(View, ValueField.GetOuterBuffer()).MakeOwned(); CbField HashField = LoadCompactBinary(Reader, StackAllocator); const IoHash& Hash = HashField.AsAttachment(); ZEN_ASSERT(!HashField.HasError(), "Attachments must be a non-empty binary value with a content hash."); -- cgit v1.2.3