From 8b65775ee11c8571eef970b74a0f8404f16c09c2 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Wed, 10 Jul 2013 15:07:57 -0500 Subject: [PATCH] Fix a couple of compiler warnings that have cropped up. --- Source/Core/DolphinWX/Src/InputConfigDiag.cpp | 1 - Source/Core/DolphinWX/Src/Main.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp index 033eca8da0..6a740aae45 100644 --- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp @@ -239,7 +239,6 @@ void GamepadPage::UpdateGUI() std::vector::const_iterator i = (*g)->control_buttons.begin() , e = (*g)->control_buttons.end(); for (; i!=e; ++i) { - ControllerInterface::ControlReference *r = (*i)->control_reference; wxString expr = StrToWxStr((*i)->control_reference->expression); expr.Replace("&", "&&"); (*i)->SetLabel(expr); diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 1cb52b828f..0cbfab1031 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -658,7 +658,7 @@ void Host_SetWiiMoteConnectionState(int _State) // Update field 1 or 2 event.SetInt(1); - NOTICE_LOG(WIIMOTE, event.GetString().c_str()); + NOTICE_LOG(WIIMOTE, "%s", static_cast(event.GetString().c_str())); main_frame->GetEventHandler()->AddPendingEvent(event); }