From 42e6dc2e2fd9306f31cb86e426782e651b531aaf Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Wed, 21 May 2014 08:40:00 -0700 Subject: [PATCH] Fix Symbian build (avoid range for.) --- UI/ControlMappingScreen.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index b995206c2d..fb61009096 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -33,9 +33,6 @@ #include "UI/UIShader.h" #include "UI/GameSettingsScreen.h" -using std::begin; -using std::end; - class ControlMapper : public UI::LinearLayout { public: ControlMapper(int pspKey, std::string keyName, ScreenManager *scrm, UI::LinearLayoutParams *layoutParams = 0); @@ -246,8 +243,9 @@ UI::EventReturn ControlMappingScreen::OnDefaultMapping(UI::EventParams ¶ms) UI::EventReturn ControlMappingScreen::OnAutoConfigure(UI::EventParams ¶ms) { std::vector items; - for (auto s : KeyMap::GetSeenPads()) { - items.push_back(s); + const auto seenPads = KeyMap::GetSeenPads(); + for (auto s = seenPads.begin(), end = seenPads.end(); s != end; ++s) { + items.push_back(*s); } I18NCategory *keyI18N = GetI18NCategory("KeyMapping"); ListPopupScreen *autoConfList = new ListPopupScreen(keyI18N->T("Autoconfigure for device"), items, -1);