diff options
| author | Stefan Boberg <[email protected]> | 2021-08-28 21:10:07 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-08-28 21:10:07 +0200 |
| commit | 82d373e7fa382db18bf123f7ca69e343567c5196 (patch) | |
| tree | 34fcedc392c6b9dab7ff77d84f75877988672db8 /zencore/include | |
| parent | Added basic file logging (diff) | |
| parent | Merge branch 'main' of https://github.com/EpicGames/zen (diff) | |
| download | zen-82d373e7fa382db18bf123f7ca69e343567c5196.tar.xz zen-82d373e7fa382db18bf123f7ca69e343567c5196.zip | |
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'zencore/include')
| -rw-r--r-- | zencore/include/zencore/filesystem.h | 3 | ||||
| -rw-r--r-- | zencore/include/zencore/httpserver.h | 1 | ||||
| -rw-r--r-- | zencore/include/zencore/scopeguard.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/zencore/include/zencore/filesystem.h b/zencore/include/zencore/filesystem.h index d8140932b..a2d368d6f 100644 --- a/zencore/include/zencore/filesystem.h +++ b/zencore/include/zencore/filesystem.h @@ -43,7 +43,8 @@ struct FileContents ZENCORE_API FileContents ReadFile(std::filesystem::path Path); ZENCORE_API bool ScanFile(std::filesystem::path Path, uint64_t ChunkSize, std::function<void(const void* Data, size_t Size)>&& ProcessFunc); -ZENCORE_API bool WriteFile(std::filesystem::path Path, const IoBuffer* const* Data, size_t BufferCount); +ZENCORE_API void WriteFile(std::filesystem::path Path, const IoBuffer* const* Data, size_t BufferCount); +ZENCORE_API void WriteFile(std::filesystem::path Path, IoBuffer Data); struct CopyFileOptions { diff --git a/zencore/include/zencore/httpserver.h b/zencore/include/zencore/httpserver.h index 86c121366..009fd9f2c 100644 --- a/zencore/include/zencore/httpserver.h +++ b/zencore/include/zencore/httpserver.h @@ -240,6 +240,7 @@ public: virtual void WriteResponse(HttpResponse HttpResponseCode, HttpContentType ContentType, std::u8string_view ResponseString) = 0; void WriteResponse(HttpResponse HttpResponseCode, CbObject Data); + void WriteResponse(HttpResponse HttpResponseCode, CbPackage Package); void WriteResponse(HttpResponse HttpResponseCode, HttpContentType ContentType, std::string_view ResponseString); protected: diff --git a/zencore/include/zencore/scopeguard.h b/zencore/include/zencore/scopeguard.h index ba8cd3094..00836f181 100644 --- a/zencore/include/zencore/scopeguard.h +++ b/zencore/include/zencore/scopeguard.h @@ -6,7 +6,7 @@ namespace zen { template<typename T> -class ScopeGuardImpl +class [[nodiscard]] ScopeGuardImpl { public: inline ScopeGuardImpl(T&& func) : m_guardFunc(func) {} |