Merge pull request #1172 from martinlindhe/fix-warnings

Fix some xcode 7 (llvm) warnings

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);

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

src/video_core/gpu_debugger.h

@@ -45,7 +45,6 @@ public:
 
     private:
         GraphicsDebugger* observed;
-        bool in_destruction;
 
         friend class GraphicsDebugger;
     };

src/video_core/rasterizer.cpp

@@ -967,6 +967,8 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0,
                         UNIMPLEMENTED();
                         break;
                     }
+
+                    return {};
                 };
 
                 auto LookupFactorA = [&](Regs::BlendFactor factor) -> u8 {
@@ -1000,6 +1002,8 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0,
                         UNIMPLEMENTED();
                         break;
                     }
+
+                    return {};
                 };
 
                 static auto EvaluateBlendEquation = [](const Math::Vec4<u8>& src, const Math::Vec4<u8>& srcfactor,

src/video_core/renderer_opengl/renderer_opengl.h

@@ -62,7 +62,6 @@ private:
                                     const TextureInfo& texture);
 
     EmuWindow*  render_window;                    ///< Handle to render window
-    u32         last_mode;                        ///< Last render mode
 
     int resolution_width;                         ///< Current resolution width
     int resolution_height;                        ///< Current resolution height