From 2dce0cd92de5369015d84b76d3a74c788a036bdd Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 21 May 2016 17:24:51 +0000 Subject: [PATCH] Fix -Wshadow warnings in newmenu_create_structure --- similar/main/newmenu.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/similar/main/newmenu.cpp b/similar/main/newmenu.cpp index 343ebae34..464d56b34 100644 --- a/similar/main/newmenu.cpp +++ b/similar/main/newmenu.cpp @@ -1165,7 +1165,7 @@ static window_event_result newmenu_key_command(window *, const d_event &event, n static void newmenu_create_structure( newmenu *menu ) { - int j,aw, tw, th, twidth,fm,right_offset; + int aw, tw, th, twidth,fm,right_offset; int nmenus, nothers; grs_canvas *save_canvas; @@ -1349,7 +1349,8 @@ static void newmenu_create_structure( newmenu *menu ) i.y += BORDERY; if (i.type == NM_TYPE_RADIO) { fm = -1; // find first marked one - for ( j=0; jnitems; j++ ) { + for (unsigned j = 0; j < menu->nitems; ++j) + { if (menu->items[j].type == NM_TYPE_RADIO && menu->items[j].group == i.group) { if (fm==-1 && menu->items[j].value) fm = j;