aboutsummaryrefslogtreecommitdiff
path: root/zencore/include
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2021-09-16 13:16:00 +0200
committerMartin Ridgers <[email protected]>2021-09-16 13:17:12 +0200
commita20d09a9fec7ab6e8a0c987cdb4247c6cf69b507 (patch)
tree64e5454f392550ec7a514d4a6fd3682f5b8ff824 /zencore/include
parentMerge from main (diff)
parentFixed misleading comment for `CbAttachment::AsCompositeBinary` (diff)
downloadzen-a20d09a9fec7ab6e8a0c987cdb4247c6cf69b507.tar.xz
zen-a20d09a9fec7ab6e8a0c987cdb4247c6cf69b507.zip
Merge from main
Diffstat (limited to 'zencore/include')
-rw-r--r--zencore/include/zencore/compactbinarypackage.h2
-rw-r--r--zencore/include/zencore/iobuffer.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/zencore/include/zencore/compactbinarypackage.h b/zencore/include/zencore/compactbinarypackage.h
index e31bc4bfd..cc2c4815a 100644
--- a/zencore/include/zencore/compactbinarypackage.h
+++ b/zencore/include/zencore/compactbinarypackage.h
@@ -74,7 +74,7 @@ public:
/** Access the attachment as binary. Defaults to a null buffer on error. */
ZENCORE_API [[nodiscard]] SharedBuffer AsBinary() const;
- /** Access the attachment as compressed binary. Defaults to a null buffer if the attachment is null. */
+ /** Access the attachment as raw binary. Defaults to a null buffer on error. */
ZENCORE_API [[nodiscard]] CompositeBuffer AsCompositeBinary() const;
/** Access the attachment as compressed binary. Defaults to a null buffer if the attachment is null. */
diff --git a/zencore/include/zencore/iobuffer.h b/zencore/include/zencore/iobuffer.h
index c3860f2b0..f8b8217d7 100644
--- a/zencore/include/zencore/iobuffer.h
+++ b/zencore/include/zencore/iobuffer.h
@@ -343,7 +343,7 @@ class IoBufferBuilder
{
public:
ZENCORE_API static IoBuffer MakeFromFile(const wchar_t* FileName, uint64_t Offset = 0, uint64_t Size = ~0ull);
- ZENCORE_API static IoBuffer MakeFromTemporaryFile(const wchar_t* FileName, uint64_t Offset = 0, uint64_t Size = ~0ull);
+ ZENCORE_API static IoBuffer MakeFromTemporaryFile(const wchar_t* FileName);
ZENCORE_API static IoBuffer MakeFromFileHandle(void* FileHandle, uint64_t Offset = 0, uint64_t Size = ~0ull);
inline static IoBuffer MakeCloneFromMemory(const void* Ptr, size_t Sz) { return IoBuffer(IoBuffer::Clone, Ptr, Sz); }
};