summaryrefslogtreecommitdiff
path: root/src/core/tracer/recorder.cpp
diff options
context:
space:
mode:
authorGravatar Martin Lindhe2015-09-25 14:33:39 +0200
committerGravatar Martin Lindhe2015-09-29 23:11:09 +0200
commitbafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481 (patch)
tree75060eef7ea204ed8c82b732bdd4ca61fe034a32 /src/core/tracer/recorder.cpp
parentMerge pull request #1160 from lioncash/clang (diff)
downloadyuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.tar.gz
yuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.tar.xz
yuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.zip
fix some xcode 7.0 warnings
Diffstat (limited to 'src/core/tracer/recorder.cpp')
-rw-r--r--src/core/tracer/recorder.cpp6
1 files changed, 3 insertions, 3 deletions
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) {
143} 143}
144 144
145void Recorder::FrameFinished() { 145void Recorder::FrameFinished() {
146 stream.push_back( { FrameMarker } ); 146 stream.push_back( { { FrameMarker } } );
147} 147}
148 148
149void Recorder::MemoryAccessed(const u8* data, u32 size, u32 physical_address) { 149void Recorder::MemoryAccessed(const u8* data, u32 size, u32 physical_address) {
150 StreamElement element = { MemoryLoad }; 150 StreamElement element = { { MemoryLoad } };
151 element.data.memory_load.size = size; 151 element.data.memory_load.size = size;
152 element.data.memory_load.physical_address = physical_address; 152 element.data.memory_load.physical_address = physical_address;
153 153
@@ -168,7 +168,7 @@ void Recorder::MemoryAccessed(const u8* data, u32 size, u32 physical_address) {
168 168
169template<typename T> 169template<typename T>
170void Recorder::RegisterWritten(u32 physical_address, T value) { 170void Recorder::RegisterWritten(u32 physical_address, T value) {
171 StreamElement element = { RegisterWrite }; 171 StreamElement element = { { RegisterWrite } };
172 element.data.register_write.size = (sizeof(T) == 1) ? CTRegisterWrite::SIZE_8 172 element.data.register_write.size = (sizeof(T) == 1) ? CTRegisterWrite::SIZE_8
173 : (sizeof(T) == 2) ? CTRegisterWrite::SIZE_16 173 : (sizeof(T) == 2) ? CTRegisterWrite::SIZE_16
174 : (sizeof(T) == 4) ? CTRegisterWrite::SIZE_32 174 : (sizeof(T) == 4) ? CTRegisterWrite::SIZE_32