diff options
Diffstat (limited to 'zencore/compactbinary.cpp')
| -rw-r--r-- | zencore/compactbinary.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp index 0e4a46fa1..0db9f02ea 100644 --- a/zencore/compactbinary.cpp +++ b/zencore/compactbinary.cpp @@ -839,10 +839,10 @@ CbFieldView::CopyTo(MutableMemoryView Buffer) const void CbFieldView::CopyTo(BinaryWriter& Ar) const { - const MemoryView Source = GetViewNoType(); + const MemoryView SourceView = GetViewNoType(); CbFieldType SerializedType = CbFieldTypeOps::GetSerializedType(Type); - Ar.Write(&SerializedType, sizeof(SerializedType)); - Ar.Write(Source.GetData(), Source.GetSize()); + const MemoryView TypeView(reinterpret_cast<const uint8_t*>(&SerializedType), sizeof(SerializedType)); + Ar.Write({TypeView, SourceView}); } MemoryView @@ -948,10 +948,10 @@ CbArrayView::CopyTo(MutableMemoryView Buffer) const void CbArrayView::CopyTo(BinaryWriter& Ar) const { - const MemoryView Source = GetPayloadView(); - CbFieldType SerializedType = CbFieldTypeOps::GetType(GetType()); - Ar.Write(&SerializedType, sizeof(SerializedType)); - Ar.Write(Source.GetData(), Source.GetSize()); + const MemoryView SourceView = GetPayloadView(); + CbFieldType SerializedType = CbFieldTypeOps::GetSerializedType(GetType()); + const MemoryView TypeView(reinterpret_cast<const uint8_t*>(&SerializedType), sizeof(SerializedType)); + Ar.Write({TypeView, SourceView}); } /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -988,7 +988,7 @@ CbObjectView::VisitFields(ICbVisitor&) CbFieldView CbObjectView::FindView(const std::string_view Name) const { - for (const CbFieldView Field : *this) + for (const CbFieldView& Field : *this) { if (Name == Field.GetName()) { @@ -1001,7 +1001,7 @@ CbObjectView::FindView(const std::string_view Name) const CbFieldView CbObjectView::FindViewIgnoreCase(const std::string_view Name) const { - for (const CbFieldView Field : *this) + for (const CbFieldView& Field : *this) { if (Name == Field.GetName()) { @@ -1061,10 +1061,10 @@ CbObjectView::CopyTo(MutableMemoryView Buffer) const void CbObjectView::CopyTo(BinaryWriter& Ar) const { - const MemoryView Source = GetPayloadView(); - CbFieldType SerializedType = CbFieldTypeOps::GetType(GetType()); - Ar.Write(&SerializedType, sizeof(SerializedType)); - Ar.Write(Source.GetData(), Source.GetSize()); + const MemoryView SourceView = GetPayloadView(); + CbFieldType SerializedType = CbFieldTypeOps::GetSerializedType(GetType()); + const MemoryView TypeView(reinterpret_cast<const uint8_t*>(&SerializedType), sizeof(SerializedType)); + Ar.Write({TypeView, SourceView}); } ////////////////////////////////////////////////////////////////////////// |