diff options
| author | Glenn Rice <glennricster@gmail.com> | 2013-07-10 15:07:57 -0500 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2013-07-10 15:07:57 -0500 |
| commit | 8b65775ee11c8571eef970b74a0f8404f16c09c2 (patch) | |
| tree | 3b5c1daf5f1358088d6711b6ea20bca848367ba6 /Source/Core | |
| parent | 1f6b70bf87f45c1706886cdc111cb466135b8d66 (diff) | |
Fix a couple of compiler warnings that have cropped up.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/InputConfigDiag.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/Main.cpp | 2 |
2 files changed, 1 insertions, 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<ControlButton*>::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<const char*>(event.GetString().c_str())); main_frame->GetEventHandler()->AddPendingEvent(event); } |