citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

service/cfg: Convert file-scope std::vector to std::array (#5320) 

Same behavior, but without a static runtime constructor that needs to
run at program start.
This commit is contained in:
Mat M 2020-05-04 06:21:56 -04:00 committed by GitHub
parent 30414eeb4b
commit 79536ddb11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/hle/service/cfg/cfg.cpp
View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm> #include <algorithm>
#include <array>
#include <tuple> #include <tuple>
#include <boost/serialization/array.hpp> #include <boost/serialization/array.hpp>
#include <boost/serialization/unique_ptr.hpp> #include <boost/serialization/unique_ptr.hpp>
@ -126,7 +127,7 @@ static const std::array<float, 8> STEREO_CAMERA_SETTINGS = {
static_assert(sizeof(STEREO_CAMERA_SETTINGS) == 0x20, static_assert(sizeof(STEREO_CAMERA_SETTINGS) == 0x20,
"STEREO_CAMERA_SETTINGS must be exactly 0x20 bytes"); "STEREO_CAMERA_SETTINGS must be exactly 0x20 bytes");
static const std::vector<u8> cfg_system_savedata_id = { constexpr std::array<u8, 8> cfg_system_savedata_id{
0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 0x01, 0x00,
}; };