aboutsummaryrefslogtreecommitdiff
path: root/zencore/compactbinarypackage.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-09-01 11:16:29 +0200
committerStefan Boberg <[email protected]>2021-09-01 11:16:29 +0200
commit9b56218bd354b46b157ecdefd3254fa8d5c3e94d (patch)
tree88a679f2e770b39e34eecb120460e2d43ab49c74 /zencore/compactbinarypackage.cpp
parentFixed a race in bucket open/create logic (diff)
downloadzen-9b56218bd354b46b157ecdefd3254fa8d5c3e94d.tar.xz
zen-9b56218bd354b46b157ecdefd3254fa8d5c3e94d.zip
CompactBinary: Added explicit operator bool for array and object types
p4 CL16069971
Diffstat (limited to 'zencore/compactbinarypackage.cpp')
-rw-r--r--zencore/compactbinarypackage.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/zencore/compactbinarypackage.cpp b/zencore/compactbinarypackage.cpp
index 074be79b3..2d89bd342 100644
--- a/zencore/compactbinarypackage.cpp
+++ b/zencore/compactbinarypackage.cpp
@@ -220,7 +220,7 @@ CbAttachment::Save(BinaryWriter& Writer) const
void
CbPackage::SetObject(CbObject InObject, const IoHash* InObjectHash, AttachmentResolver* InResolver)
{
- if (InObject.CreateIterator())
+ if (InObject)
{
Object = InObject.IsOwned() ? std::move(InObject) : CbObject::Clone(InObject);
if (InObjectHash)
@@ -432,7 +432,7 @@ CbPackage::TryLoad(BinaryReader& Reader, BufferAllocator Allocator, AttachmentRe
return false;
}
Object.MakeOwned();
- if (Object.CreateViewIterator())
+ if (Object)
{
CbField HashField = LoadCompactBinary(Reader, StackAllocator);
ObjectHash = HashField.AsObjectAttachment();
@@ -452,7 +452,7 @@ CbPackage::TryLoad(BinaryReader& Reader, BufferAllocator Allocator, AttachmentRe
void
CbPackage::Save(CbWriter& Writer) const
{
- if (Object.CreateIterator())
+ if (Object)
{
Writer.AddObject(Object);
Writer.AddObjectAttachment(ObjectHash);