summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorMartin Lindhe <martin@ubique.se>2015-09-25 14:33:39 +0200
committerMartin Lindhe <martin@ubique.se>2015-09-29 23:11:09 +0200
commitbafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481 (patch)
tree75060eef7ea204ed8c82b732bdd4ca61fe034a32 /src/core
parentMerge pull request #1160 from lioncash/clang (diff)
downloadyuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.tar
yuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.tar.gz
yuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.tar.bz2
yuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.tar.lz
yuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.tar.xz
yuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.tar.zst
yuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/cfg/cfg.cpp2
-rw-r--r--src/core/tracer/recorder.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index 715a9b8c3..56986a49e 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -345,7 +345,7 @@ ResultCode FormatConfig() {
char16_t country_name_buffer[16][0x40] = {};
for (size_t i = 0; i < 16; ++i) {
- auto size = Common::UTF8ToUTF16("Gensokyo").copy(country_name_buffer[i], 0x40);
+ Common::UTF8ToUTF16("Gensokyo").copy(country_name_buffer[i], 0x40);
}
// 0x000B0001 - Localized names for the profile Country
res = CreateConfigInfoBlk(0x000B0001, sizeof(country_name_buffer), 0xE, country_name_buffer);
diff --git a/src/core/tracer/recorder.cpp b/src/core/tracer/recorder.cpp
index 656706c0c..c6dc35c83 100644
--- a/src/core/tracer/recorder.cpp
+++ b/src/core/tracer/recorder.cpp
@@ -143,11 +143,11 @@ void Recorder::Finish(const std::string& filename) {
}
void Recorder::FrameFinished() {
- stream.push_back( { FrameMarker } );
+ stream.push_back( { { FrameMarker } } );
}
void Recorder::MemoryAccessed(const u8* data, u32 size, u32 physical_address) {
- StreamElement element = { MemoryLoad };
+ StreamElement element = { { MemoryLoad } };
element.data.memory_load.size = size;
element.data.memory_load.physical_address = physical_address;
@@ -168,7 +168,7 @@ void Recorder::MemoryAccessed(const u8* data, u32 size, u32 physical_address) {
template<typename T>
void Recorder::RegisterWritten(u32 physical_address, T value) {
- StreamElement element = { RegisterWrite };
+ StreamElement element = { { RegisterWrite } };
element.data.register_write.size = (sizeof(T) == 1) ? CTRegisterWrite::SIZE_8
: (sizeof(T) == 2) ? CTRegisterWrite::SIZE_16
: (sizeof(T) == 4) ? CTRegisterWrite::SIZE_32