From 1abeea5e2c09f8615a3c9412704f3aeeaa3ad5ee Mon Sep 17 00:00:00 2001 From: David van der Spoel Date: Mon, 31 Mar 2014 21:52:36 +0200 Subject: [PATCH] Fixed compilation issue in fgrid.cpp due to int/enum gcc 4.8 is somewhat more picky about enums, and this patch fixes an issue where an enum variable was used outside of the defined range. Change-Id: Ibfd7720d1d3e575c45bc1d5dbd30daad6391400c --- src/programs/view/fgrid.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/programs/view/fgrid.cpp b/src/programs/view/fgrid.cpp index 7eee65889f..3c77f0d095 100644 --- a/src/programs/view/fgrid.cpp +++ b/src/programs/view/fgrid.cpp @@ -303,12 +303,12 @@ void DoneFGrid(t_fgrid *fgrid) static t_fitem *ScanFItem(const char *infile, FILE *in, char *buf) { char set[STRLEN], get[STRLEN], help[STRLEN], def[STRLEN]; - edlgitem edlg; + int edlg; t_fitem *fitem; fitem = NewFItem(); - for (edlg = (edlgitem)0; (edlg < edlgNR+1); edlg = (edlgitem)(edlg + 1)) + for (edlg = 0; (edlg < edlgNR+1); edlg++) { if (strcmp(buf, type[edlg]) == 0) { @@ -326,7 +326,7 @@ static t_fitem *ScanFItem(const char *infile, FILE *in, char *buf) ReadDlgErr(infile, eITEMEXP, buf); } - fitem->edlg = edlg; + fitem->edlg = (edlgitem)edlg; switch (edlg) { case edlgBN: -- 2.22.0