diff --git a/openVulkanoCpp/Data/Containers/Array.hpp b/openVulkanoCpp/Data/Containers/Array.hpp index d55deca..7023cf9 100644 --- a/openVulkanoCpp/Data/Containers/Array.hpp +++ b/openVulkanoCpp/Data/Containers/Array.hpp @@ -127,6 +127,8 @@ namespace OpenVulkano ::operator delete(data); } + void Reset() { *this = Array(); } + Array& operator=(const Array& rhs) { if (this == &rhs) return *this; diff --git a/openVulkanoCpp/IO/FileDescription.hpp b/openVulkanoCpp/IO/FileDescription.hpp index c2c5181..098949f 100644 --- a/openVulkanoCpp/IO/FileDescription.hpp +++ b/openVulkanoCpp/IO/FileDescription.hpp @@ -24,6 +24,15 @@ namespace OpenVulkano [[deprecated("Use MkFile instead")]] static FileDescription MakeDescriptionForFile(const char* path, const size_t size) { return MkFile(path, size); } + void Reset() + { + type = std::filesystem::file_type::unknown; + path = ""; + size = 0; + permissions = {}; + createTime = modTime = {}; + } + static FileDescription MkFile(const char* path, const size_t size) { return { diff --git a/tests/IO/Archive/ArchiveReaderTest.cpp b/tests/IO/Archive/ArchiveReaderTest.cpp index 73ec031..ed4b3e5 100644 --- a/tests/IO/Archive/ArchiveReaderTest.cpp +++ b/tests/IO/Archive/ArchiveReaderTest.cpp @@ -6,14 +6,14 @@ #include -#include -#include -#include - #include "IO/Archive/ArchiveReader.hpp" #include "IO/Archive/ArchiveWriter.hpp" #include "IO/AppFolders.hpp" +#include +#include +#include + using namespace OpenVulkano; namespace diff --git a/tests/IO/Archive/ZipWriterTest.cpp b/tests/IO/Archive/ZipWriterTest.cpp index 6b70d21..f07e92e 100644 --- a/tests/IO/Archive/ZipWriterTest.cpp +++ b/tests/IO/Archive/ZipWriterTest.cpp @@ -39,7 +39,7 @@ TEST_CASE("Zip with one file(AAA.txt that has 'AAA')", "[ZipWriter]") { ZipWriter writer(oneFileZipPath); - FileDescription desc = FileDescription::MakeDescriptionForFile("AAA.txt", 3); + FileDescription desc = FileDescription::MkFile("AAA.txt", 3); desc.modTime = {}; desc.createTime = {}; char buffer[] = {'A', 'A', 'A'}; @@ -73,12 +73,12 @@ TEST_CASE("Zip with two files(AAA.txt that has 'AAA', BBB.bin that has 'BBB')", { ZipWriter writer(twoFilesZipPath); - FileDescription aaa = FileDescription::MakeDescriptionForFile("AAA.txt", 3); + FileDescription aaa = FileDescription::MkFile("AAA.txt", 3); aaa.modTime = {}; aaa.createTime = {}; char aaaBuffer[] = {'A', 'A', 'A'}; - FileDescription bbb = FileDescription::MakeDescriptionForFile("BBB.bin", 3); + FileDescription bbb = FileDescription::MkFile("BBB.bin", 3); bbb.modTime = {}; bbb.createTime = {}; char bbbBuffer[] = {'B', 'B', 'B'};