ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of compiler warnings that have cropped up.

This commit is contained in:
Glenn Rice 2013-07-10 15:07:57 -05:00
parent 1f6b70bf87
commit 8b65775ee1
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/DolphinWX/Src/InputConfigDiag.cpp
View File

@ -239,7 +239,6 @@ void GamepadPage::UpdateGUI()
std::vector<ControlButton*>::const_iterator i = (*g)->control_buttons.begin() std::vector<ControlButton*>::const_iterator i = (*g)->control_buttons.begin()
, e = (*g)->control_buttons.end(); , e = (*g)->control_buttons.end();
for (; i!=e; ++i) { for (; i!=e; ++i) {
ControllerInterface::ControlReference *r = (*i)->control_reference;
wxString expr = StrToWxStr((*i)->control_reference->expression); wxString expr = StrToWxStr((*i)->control_reference->expression);
expr.Replace("&", "&&"); expr.Replace("&", "&&");
(*i)->SetLabel(expr); (*i)->SetLabel(expr);

2
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -658,7 +658,7 @@ void Host_SetWiiMoteConnectionState(int _State)
// Update field 1 or 2 // Update field 1 or 2
event.SetInt(1); 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); main_frame->GetEventHandler()->AddPendingEvent(event);
} }