diff options
author | Lioncash <mathew1800@gmail.com> | 2020-08-05 17:47:41 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-08-05 18:37:00 +0200 |
commit | 0a5456feb9bc2a0e7f02b4b7cee34f0353e76b59 (patch) | |
tree | e88b639971d1b41d944829db79083e92b7548415 /src/core/file_sys/system_archive/time_zone_binary.cpp | |
parent | Merge pull request #4476 from lioncash/tz (diff) | |
download | yuzu-0a5456feb9bc2a0e7f02b4b7cee34f0353e76b59.tar yuzu-0a5456feb9bc2a0e7f02b4b7cee34f0353e76b59.tar.gz yuzu-0a5456feb9bc2a0e7f02b4b7cee34f0353e76b59.tar.bz2 yuzu-0a5456feb9bc2a0e7f02b4b7cee34f0353e76b59.tar.lz yuzu-0a5456feb9bc2a0e7f02b4b7cee34f0353e76b59.tar.xz yuzu-0a5456feb9bc2a0e7f02b4b7cee34f0353e76b59.tar.zst yuzu-0a5456feb9bc2a0e7f02b4b7cee34f0353e76b59.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/file_sys/system_archive/time_zone_binary.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/file_sys/system_archive/time_zone_binary.cpp b/src/core/file_sys/system_archive/time_zone_binary.cpp index d1de63f20..8fd005012 100644 --- a/src/core/file_sys/system_archive/time_zone_binary.cpp +++ b/src/core/file_sys/system_archive/time_zone_binary.cpp @@ -654,12 +654,13 @@ static VirtualFile GenerateDefaultTimeZoneFile() { } VirtualDir TimeZoneBinary() { - const std::vector<VirtualDir> root_dirs{std::make_shared<VectorVfsDirectory>( + std::vector<VirtualDir> root_dirs{std::make_shared<VectorVfsDirectory>( std::vector<VirtualFile>{GenerateDefaultTimeZoneFile()}, std::vector<VirtualDir>{}, "zoneinfo")}; - const std::vector<VirtualFile> root_files{ - std::make_shared<ArrayVfsFile<LOCATION_NAMES.size()>>(LOCATION_NAMES, "binaryList.txt")}; - return std::make_shared<VectorVfsDirectory>(root_files, root_dirs, "data"); + std::vector<VirtualFile> root_files{MakeArrayFile(LOCATION_NAMES, "binaryList.txt")}; + + return std::make_shared<VectorVfsDirectory>(std::move(root_files), std::move(root_dirs), + "data"); } } // namespace FileSys::SystemArchive |