midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use std::begin and std::end for system archives c array

Browse Source
This commit is contained in:
B3n30 2018-07-28 12:07:11 +02:00
parent 8a2c44be56
commit 97fda30839
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/file_sys/archive_ncch.cpp
View File

@ -122,8 +122,8 @@ ResultVal<std::unique_ptr<FileBackend>> NCCHArchive::OpenFile(const Path& path,
LOG_WARNING( LOG_WARNING(
Service_FS, Service_FS,
"Shared Font file missing. Loading open source replacement from memory"); "Shared Font file missing. Loading open source replacement from memory");
std::vector<u8> shared_font_file; const std::vector<u8> shared_font_file(std::begin(SHARED_FONT_DATA),
shared_font_file.assign(SHARED_FONT_DATA, SHARED_FONT_DATA + SHARED_FONT_DATA_len); std::end(SHARED_FONT_DATA));
u64 romfs_offset = 0; u64 romfs_offset = 0;
u64 romfs_size = shared_font_file.size(); u64 romfs_size = shared_font_file.size();
std::unique_ptr<DelayGenerator> delay_generator = std::unique_ptr<DelayGenerator> delay_generator =
@ -137,9 +137,8 @@ ResultVal<std::unique_ptr<FileBackend>> NCCHArchive::OpenFile(const Path& path,
LOG_WARNING( LOG_WARNING(
Service_FS, Service_FS,
"Bad Word List file missing. Loading open source replacement from memory"); "Bad Word List file missing. Loading open source replacement from memory");
std::vector<u8> bad_word_list_file; const std::vector<u8> bad_word_list_file(std::begin(BAD_WORD_LIST_DATA),
bad_word_list_file.assign(BAD_WORD_LIST_DATA, std::end(BAD_WORD_LIST_DATA));
BAD_WORD_LIST_DATA + BAD_WORD_LIST_DATA_len);
u64 romfs_offset = 0; u64 romfs_offset = 0;
u64 romfs_size = bad_word_list_file.size(); u64 romfs_size = bad_word_list_file.size();
std::unique_ptr<DelayGenerator> delay_generator = std::unique_ptr<DelayGenerator> delay_generator =