diff --git a/openVulkanoCpp/IO/Archive/ArchiveReader.cpp b/openVulkanoCpp/IO/Archive/ArchiveReader.cpp index a92d4aa..6721701 100644 --- a/openVulkanoCpp/IO/Archive/ArchiveReader.cpp +++ b/openVulkanoCpp/IO/Archive/ArchiveReader.cpp @@ -36,7 +36,7 @@ namespace openVulkanoCpp ArchiveReader::ArchiveReader(const void* archiveBuffer, const size_t size, const std::shared_ptr& logger) : ArchiveReader(logger) { - Open(archiveBuffer, size); + OpenMemory(archiveBuffer, size); } ArchiveReader::~ArchiveReader() = default; @@ -62,7 +62,7 @@ namespace openVulkanoCpp return Open(archiveFile.c_str()); } - bool ArchiveReader::Open(const void* archiveBuffer, size_t size) + bool ArchiveReader::OpenMemory(const void* archiveBuffer, size_t size) { PrepOpen(); ChkErr(archive_read_open_memory(m_archive, archiveBuffer, size)); @@ -85,7 +85,7 @@ namespace openVulkanoCpp std::vector files; std::regex fileRegex(fileNamePattern); - for(auto const& dirEntry : std::filesystem::directory_iterator(dir)) + for(const std::filesystem::directory_entry& dirEntry : std::filesystem::directory_iterator(dir)) { std::string entryPath = dirEntry.path().string(); if (std::regex_match(entryPath, fileRegex)) @@ -244,7 +244,7 @@ namespace openVulkanoCpp { const void *buffer; size_t size; - ssize_t offset, r; + int64_t offset, r; while ((r = archive_read_data_block(m_archive, &buffer, &size, &offset)) != ARCHIVE_EOF) { ChkErr(r); diff --git a/openVulkanoCpp/IO/Archive/ArchiveReader.hpp b/openVulkanoCpp/IO/Archive/ArchiveReader.hpp index 13e7204..46cc0e3 100644 --- a/openVulkanoCpp/IO/Archive/ArchiveReader.hpp +++ b/openVulkanoCpp/IO/Archive/ArchiveReader.hpp @@ -35,7 +35,7 @@ namespace openVulkanoCpp bool Open(const std::string& archiveFile); - bool Open(const void* archiveBuffer, size_t size); + bool OpenMemory(const void* archiveBuffer, size_t size); bool Open(const std::vector& archiveFiles); diff --git a/openVulkanoCpp/IO/Archive/LibArchiveHelper.hpp b/openVulkanoCpp/IO/Archive/LibArchiveHelper.hpp index 78c1d1c..b75de60 100644 --- a/openVulkanoCpp/IO/Archive/LibArchiveHelper.hpp +++ b/openVulkanoCpp/IO/Archive/LibArchiveHelper.hpp @@ -55,7 +55,7 @@ namespace openVulkanoCpp { const void* buffer; size_t size; - ssize_t offset, r; + int64_t offset, r; while (true) { @@ -93,7 +93,7 @@ namespace openVulkanoCpp struct archive* m_archive; char* m_buffer; size_t m_currentBlockSize; - ssize_t offset, r; + int64_t offset, r; bool ReadNextBlock() {