diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-06 07:42:43 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 04:45:06 +0200 |
commit | c0eaa662d47daa7a148fd63b2634ea59a559296c (patch) | |
tree | 27acf97278304536b457a4593f9ad045564899bb /src/core/hle | |
parent | FileSys: De-inline Path members (diff) | |
download | yuzu-c0eaa662d47daa7a148fd63b2634ea59a559296c.tar yuzu-c0eaa662d47daa7a148fd63b2634ea59a559296c.tar.gz yuzu-c0eaa662d47daa7a148fd63b2634ea59a559296c.tar.bz2 yuzu-c0eaa662d47daa7a148fd63b2634ea59a559296c.tar.lz yuzu-c0eaa662d47daa7a148fd63b2634ea59a559296c.tar.xz yuzu-c0eaa662d47daa7a148fd63b2634ea59a559296c.tar.zst yuzu-c0eaa662d47daa7a148fd63b2634ea59a559296c.zip |
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/config_mem.cpp | 5 | ||||
-rw-r--r-- | src/core/hle/shared_page.cpp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/core/hle/config_mem.cpp b/src/core/hle/config_mem.cpp index 9fcfcc285..35dc9cf58 100644 --- a/src/core/hle/config_mem.cpp +++ b/src/core/hle/config_mem.cpp @@ -2,6 +2,9 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <cstring> + +#include "common/assert.h" #include "common/common_types.h" #include "common/common_funcs.h" @@ -61,7 +64,7 @@ template void Read<u16>(u16 &var, const u32 addr); template void Read<u8>(u8 &var, const u32 addr); void Init() { - memset(&config_mem, 0, sizeof(config_mem)); + std::memset(&config_mem, 0, sizeof(config_mem)); config_mem.update_flag = 0; // No update config_mem.sys_core_ver = 0x2; diff --git a/src/core/hle/shared_page.cpp b/src/core/hle/shared_page.cpp index 94fae2551..4f227a370 100644 --- a/src/core/hle/shared_page.cpp +++ b/src/core/hle/shared_page.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <cstring> + #include "common/common_types.h" #include "common/common_funcs.h" @@ -62,7 +64,7 @@ template void Read<u16>(u16 &var, const u32 addr); template void Read<u8>(u8 &var, const u32 addr); void Set3DSlider(float amount) { - memset(&shared_page, 0, sizeof(shared_page)); + std::memset(&shared_page, 0, sizeof(shared_page)); shared_page.sliderstate_3d = amount; shared_page.ledstate_3d = (amount == 0.0f); // off when non-zero |