From 4d6951bbeb21f6eec86686f512503cb105ac2b2e Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 22 Oct 2023 20:35:57 -0500 Subject: [PATCH] [ox/fs] Add ox::Buffer constructor to FileSystemTemplate (synced from ebb8b12c4e7f1f5898eefdd18f122b9dfb204f23) --- src/ox/fs/filesystem/filesystem.hpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/ox/fs/filesystem/filesystem.hpp b/src/ox/fs/filesystem/filesystem.hpp index 868a8aeb6..13fc20273 100644 --- a/src/ox/fs/filesystem/filesystem.hpp +++ b/src/ox/fs/filesystem/filesystem.hpp @@ -165,6 +165,8 @@ class FileSystemTemplate: public MemFS { FileSystemTemplate(void *buffer, uint64_t bufferSize, void(*freeBuffer)(char*) = detail::fsBuffFree) noexcept; + explicit FileSystemTemplate(ox::Buffer &buffer) noexcept; + explicit FileSystemTemplate(FileStore fs) noexcept; ~FileSystemTemplate() noexcept override; @@ -238,6 +240,11 @@ FileSystemTemplate::FileSystemTemplate(FileStore fs) noexc m_fs = fs; } +template +FileSystemTemplate::FileSystemTemplate(ox::Buffer &buffer) noexcept: + m_fs(buffer.data(), static_cast(buffer.size())) { +} + template FileSystemTemplate::FileSystemTemplate(void *buffer, uint64_t bufferSize, void(*freeBuffer)(char*)) noexcept: m_fs(buffer, static_cast(bufferSize)),