Turn on most -Wunused warnings for C++ code.

They used to be on, but some merge from release-4-6 ages ago removed
the flags.  Now, also -Wunused-parameter can be enabled.  At least new
code can now be kept free of these warnings; there is still ~150
warnings left for non(-thread)-MPI compiled C code.

Fix remaining warnings in C++ code.

Change-Id: I15628665ae9214c8d44b58bab5f963a3e1bc74bd

diff --git a/cmake/gmxCFlags.cmake b/cmake/gmxCFlags.cmake
index 14ca55fef67779da9fff8cb3c4cb33f485996199..36c4ee22acab9c0426f5992ac0035916f52f95ae 100644 (file)
--- a/cmake/gmxCFlags.cmake
+++ b/cmake/gmxCFlags.cmake
@@ -47,7 +47,7 @@ MACRO(gmx_c_flags)
         if(NOT GMX_OPENMP)
             GMX_TEST_CXXFLAG(CXXFLAGS_PRAGMA "-Wno-unknown-pragmas" GMXC_CXXFLAGS)
         endif()
-        GMX_TEST_CXXFLAG(CXXFLAGS_WARN "-Wall -Wno-unused -Wunused-value" GMXC_CXXFLAGS)
+        GMX_TEST_CXXFLAG(CXXFLAGS_WARN "-Wall -Wno-unused-function" GMXC_CXXFLAGS)
         GMX_TEST_CXXFLAG(CXXFLAGS_WARN_EFFCXX "-Wnon-virtual-dtor" GMXC_CXXFLAGS)
         GMX_TEST_CXXFLAG(CXXFLAGS_WARN_EXTRA "-Wextra -Wno-missing-field-initializers" GMXC_CXXFLAGS)
       # new in gcc 4.5
@@ -142,7 +142,8 @@ MACRO(gmx_c_flags)
         if(NOT GMX_OPENMP)
             GMX_TEST_CXXFLAG(CXXFLAGS_PRAGMA "-Wno-unknown-pragmas" GMXC_CXXFLAGS)
         endif()
-        GMX_TEST_CXXFLAG(CXXFLAGS_WARN "-Wall -Wno-unused-function -Wunused-value" GMXC_CXXFLAGS)
+        GMX_TEST_CXXFLAG(CXXFLAGS_WARN "-Wall -Wno-unused-function" GMXC_CXXFLAGS)
+        GMX_TEST_CXXFLAG(CXXFLAGS_WARN_EXTRA "-Wextra -Wno-missing-field-initializers" GMXC_CXXFLAGS)
     endif()
 
     # now actually set the flags:

diff --git a/src/gromacs/fft/fft5d.cpp b/src/gromacs/fft/fft5d.cpp
index 571c84a58570b39ba5355d95be137ed082f23b4f..8dad350e256967af55cb93cd61b5a795555c3860 100644 (file)
--- a/src/gromacs/fft/fft5d.cpp
+++ b/src/gromacs/fft/fft5d.cpp
@@ -1357,6 +1357,9 @@ fft5d_plan fft5d_plan_3d_cart(int NG, int MG, int KG, MPI_Comm comm, int P0, int
     MPI_Cart_get(gcart, 2, P, wrap, coor);
     MPI_Cart_sub(gcart, rdim1, &cart[0]);
     MPI_Cart_sub(gcart, rdim2, &cart[1]);
+#else
+    (void)P0;
+    (void)comm;
 #endif
     return fft5d_plan_3d(NG, MG, KG, cart, flags, rlin, rlout, rlout2, rlout3, nthreads);
 }

diff --git a/src/programs/view/buttons.cpp b/src/programs/view/buttons.cpp
index 5a0fc376b8904e10ff25aaf0f1c291206d86bb6d..bb2086da0133e507bb19d7deb2f000c97cbfcfdf 100644 (file)
--- a/src/programs/view/buttons.cpp
+++ b/src/programs/view/buttons.cpp
@@ -75,7 +75,7 @@ static void move_bbox(t_x11 *x11, t_butbox *bbox)
     }
 }
 
-static bool BBCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
+static bool BBCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
 {
     t_butbox *bbox;
 
@@ -89,7 +89,7 @@ static bool BBCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
     return false;
 }
 
-static bool VBCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
+static bool VBCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
 {
     t_butbox  *vbox;
     int        y0;
@@ -115,7 +115,7 @@ void set_vbtime(t_x11 *x11, t_butbox *vbox, char *text)
     ExposeWin(x11->disp, vbox->wd.self);
 }
 
-static bool ButtonCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
+static bool ButtonCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
 {
     XEvent     letter;
     t_mwbut   *but;
@@ -182,7 +182,7 @@ t_butbox *init_vbox(t_x11 *x11, Window Parent, Window SendTo, unsigned long fg,
             y0+play_height+2*AIR, 1, "VCR - Control");
     vb->wd.self = XCreateSimpleWindow(x11->disp, Parent,
                                       vb->wd.x, vb->wd.y, vb->wd.width, vb->wd.height,
-                                      vb->wd.bwidth, WHITE, BLACK);
+                                      vb->wd.bwidth, fg, bg);
     x11->RegisterCallback(x11, vb->wd.self, Parent, VBCallBack, vb);
     x11->SetInputMask(x11, vb->wd.self, ExposureMask);
 

diff --git a/src/programs/view/dialogs.cpp b/src/programs/view/dialogs.cpp
index c545c70f4bfb819b5c1d38867e904ca1154063b8..63ab549c6f132172a275a951f9db539b7ca26ead 100644 (file)
--- a/src/programs/view/dialogs.cpp
+++ b/src/programs/view/dialogs.cpp
@@ -131,8 +131,8 @@ static void hide_mb(t_gmx *gmx)
     }
 }
 
-static void MBCallback(t_x11 *x11, int dlg_mess, int item_id,
-                       char *set, void *data)
+static void MBCallback(t_x11 * /*x11*/, int dlg_mess, int /*item_id*/,
+                       char * /*set*/, void *data)
 {
     t_gmx *gmx;
 
@@ -158,7 +158,7 @@ static t_dlg *about_mb(t_x11 *x11, t_gmx *gmx)
                       MBCallback, gmx);
 }
 
-static void QuitCB(t_x11 *x11, int dlg_mess, int item_id,
+static void QuitCB(t_x11 *x11, int dlg_mess, int /*item_id*/,
                    char *set, void *data)
 {
     t_gmx  *gmx;

diff --git a/src/programs/view/filter.cpp b/src/programs/view/filter.cpp
index 149736581a84d1f8d5d4f8282fa26b8d19bc73be..37ad432b10a7eeb20d7063d15489e460cb745048 100644 (file)
--- a/src/programs/view/filter.cpp
+++ b/src/programs/view/filter.cpp
@@ -77,7 +77,7 @@ t_filter *init_filter(t_atoms *atoms, const char *fn, int natom_trx)
     return f;
 }
 
-static void FilterCB(t_x11 *x11, int dlg_mess, int item_id,
+static void FilterCB(t_x11 *x11, int dlg_mess, int /*item_id*/,
                      char *set, void *data)
 {
     int       nset;

diff --git a/src/programs/view/logo.cpp b/src/programs/view/logo.cpp
index f0980df08261bdfe3186367a7d8fca9f09b4daf1..8c9d0d175bfa254395b5a225a280a97a0311f244 100644 (file)
--- a/src/programs/view/logo.cpp
+++ b/src/programs/view/logo.cpp
@@ -66,7 +66,7 @@ void hide_logo(t_x11 *x11, t_logo *logo)
     XUnmapWindow(x11->disp, logo->wd.self);
 }
 
-static bool LogoCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
+static bool LogoCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
 {
     /* Assume window is 100x110 */
     static bool bFirst = true;

diff --git a/src/programs/view/manager.cpp b/src/programs/view/manager.cpp
index 2d17c958a7377449b7d1d0aac97a1ed7e631902d..79d66ed4e3726b3e1b9371b015a0259894c71e3b 100644 (file)
--- a/src/programs/view/manager.cpp
+++ b/src/programs/view/manager.cpp
@@ -495,7 +495,7 @@ static void HandleClient(t_x11 *x11, t_manager *man, long data[])
     }
 }
 
-static bool TitleCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
+static bool TitleCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
 {
     t_windata *wd;
 
@@ -519,7 +519,7 @@ static bool TitleCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
     return false;
 }
 
-static bool ManCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
+static bool ManCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
 {
     t_manager *man;
     int        width, height;

diff --git a/src/programs/view/molps.cpp b/src/programs/view/molps.cpp
index a2f851e79a3d1c776fbbcb8c528102c419352d56..4f95bbf0f8d3f358a9e75f177a419d3c4750be83 100644 (file)
--- a/src/programs/view/molps.cpp
+++ b/src/programs/view/molps.cpp
@@ -100,56 +100,45 @@ static bool local_pbc_dx(rvec x1, rvec x2)
 
 static void ps_draw_bond(t_psdata ps,
                          atom_id ai, atom_id aj, iv2 vec2[],
-                         rvec x[], char **atomnm[], int size[], bool bBalls)
+                         rvec x[], char **atomnm[])
 {
     char    *ic, *jc;
     int      xi, yi, xj, yj;
     int      xm, ym;
 
-    if (bBalls)
+    if (local_pbc_dx(x[ai], x[aj]))
     {
-        ps_draw_atom(ps, ai, vec2, atomnm);
-        ps_draw_atom(ps, aj, vec2, atomnm);
-    }
-    else
-    {
-        if (local_pbc_dx(x[ai], x[aj]))
+        ic = *atomnm[ai];
+        jc = *atomnm[aj];
+        xi = vec2[ai][XX];
+        yi = vec2[ai][YY];
+        xj = vec2[aj][XX];
+        yj = vec2[aj][YY];
+
+        if (ic != jc)
+        {
+            xm = (xi+xj) >> 1;
+            ym = (yi+yj) >> 1;
+
+            ps_rgb(ps, Type2RGB(ic));
+            ps_line(ps, xi, yi, xm, ym);
+            ps_rgb(ps, Type2RGB(jc));
+            ps_line(ps, xm, ym, xj, yj);
+        }
+        else
         {
-            ic = *atomnm[ai];
-            jc = *atomnm[aj];
-            xi = vec2[ai][XX];
-            yi = vec2[ai][YY];
-            xj = vec2[aj][XX];
-            yj = vec2[aj][YY];
-
-            if (ic != jc)
-            {
-                xm = (xi+xj) >> 1;
-                ym = (yi+yj) >> 1;
-
-                ps_rgb(ps, Type2RGB(ic));
-                ps_line(ps, xi, yi, xm, ym);
-                ps_rgb(ps, Type2RGB(jc));
-                ps_line(ps, xm, ym, xj, yj);
-            }
-            else
-            {
-                ps_rgb(ps, Type2RGB(ic));
-                ps_line(ps, xi, yi, xj, yj);
-            }
+            ps_rgb(ps, Type2RGB(ic));
+            ps_line(ps, xi, yi, xj, yj);
         }
     }
 }
 
-void ps_draw_objects(t_psdata ps, int nobj, t_object objs[], iv2 vec2[], rvec x[],
-                     char **atomnm[], int size[], bool bShowHydro, int bond_type,
-                     bool bPlus)
+static void ps_draw_objects(t_psdata ps, int nobj, t_object objs[], iv2 vec2[],
+                            rvec x[], char **atomnm[], bool bShowHydro)
 {
-    bool         bBalls;
     int          i;
     t_object    *obj;
 
-    bBalls = false;
     for (i = 0; (i < nobj); i++)
     {
         obj = &(objs[i]);
@@ -159,12 +148,12 @@ void ps_draw_objects(t_psdata ps, int nobj, t_object objs[], iv2 vec2[], rvec x[
                 ps_draw_atom(ps, obj->ai, vec2, atomnm);
                 break;
             case eOBond:
-                ps_draw_bond(ps, obj->ai, obj->aj, vec2, x, atomnm, size, bBalls);
+                ps_draw_bond(ps, obj->ai, obj->aj, vec2, x, atomnm);
                 break;
             case eOHBond:
                 if (bShowHydro)
                 {
-                    ps_draw_bond(ps, obj->ai, obj->aj, vec2, x, atomnm, size, bBalls);
+                    ps_draw_bond(ps, obj->ai, obj->aj, vec2, x, atomnm);
                 }
                 break;
             default:
@@ -256,7 +245,7 @@ void ps_draw_mol(t_psdata ps, t_manager *man)
             v4_to_iv2(x4, vec2[i], x0, y0, sx, sy);
         }
     }
-    set_sizes(man, sx, sy);
+    set_sizes(man);
 
     z_fill (man, man->zz);
 
@@ -278,8 +267,7 @@ void ps_draw_mol(t_psdata ps, t_manager *man)
     /* Draw the objects */
     ps_draw_objects(ps,
                     nvis, man->obj, man->ix, man->x, man->top.atoms.atomname,
-                    man->size,
-                    mw->bShowHydrogen, mw->bond_type, man->bPlus);
+                    mw->bShowHydrogen);
 
     /* Draw the labels */
     ps_color(ps, 0, 0, 0);

diff --git a/src/programs/view/nleg.cpp b/src/programs/view/nleg.cpp
index acc23e10d5621bdccd0e0e2a76d3d09466c6c8bb..e07e8bcbb707c853ea0470e3bdb5ae333639f48b 100644 (file)
--- a/src/programs/view/nleg.cpp
+++ b/src/programs/view/nleg.cpp
@@ -141,7 +141,7 @@ void DrawLegend(t_x11 *x11, t_windata *Win)
     XSetForeground(x11->disp, x11->gc, x11->fg);
 }
 
-static bool LegWCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
+static bool LegWCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
 {
     t_legendwin *lw;
 

diff --git a/src/programs/view/nmol.cpp b/src/programs/view/nmol.cpp
index 8851f6c5fa5a63edc8fed432d10566de46c542a8..9b56d118547f08dd965d4c94db5160ae2b594fa5 100644 (file)
--- a/src/programs/view/nmol.cpp
+++ b/src/programs/view/nmol.cpp
@@ -53,7 +53,7 @@
 
 #define MSIZE 4
 
-static bool MWCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
+static bool MWCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
 {
     t_molwin *mw;
     Window    To;
@@ -467,7 +467,7 @@ static void draw_box(t_x11 *x11, Window w, t_3dview *view, matrix box,
     int         i, j, k, i0, i1;
     rvec        corner[NCUCEDGE], box_center;
     vec4        x4;
-    iv2         vec2[NCUCEDGE], tv2;
+    iv2         vec2[NCUCEDGE];
 
     calc_box_center(view->ecenter, box, box_center);
     if (boxtype == esbTrunc)
@@ -548,11 +548,9 @@ static void draw_box(t_x11 *x11, Window w, t_3dview *view, matrix box,
     }
 }
 
-void set_sizes(t_manager *man, real sx, real sy)
+void set_sizes(t_manager *man)
 {
-    int  i;
-
-    for (i = 0; (i < man->natom); i++)
+    for (int i = 0; i < man->natom; i++)
     {
         if (man->bVis[i])
         {
@@ -602,7 +600,7 @@ void draw_mol(t_x11 *x11, t_manager *man)
             v4_to_iv2(x4, vec2[i], x0, y0, sx, sy);
         }
     }
-    set_sizes(man, sx, sy);
+    set_sizes(man);
 
     z_fill (man, man->zz);
 

diff --git a/src/programs/view/nmol.h b/src/programs/view/nmol.h
index 4c0d81248b1e55dbe2350578b2c05af05982db3e..cd6b853aa72efa31b3174419a63daee5dc0f0423 100644 (file)
--- a/src/programs/view/nmol.h
+++ b/src/programs/view/nmol.h
@@ -51,7 +51,7 @@ extern void z_fill(t_manager *man, real *zz);
 extern void create_visibility(t_manager *man);
 extern int  compare_obj(const void *a, const void *b);
 extern int  filter_vis(t_manager *man);
-extern void set_sizes(t_manager *man, real sx, real sy);
+extern void set_sizes(t_manager *man);
 
 extern bool toggle_hydrogen(t_x11 *x11, t_molwin *mw);
 /* Toggle the state of the hydrogen drawing,

diff --git a/src/programs/view/popup.cpp b/src/programs/view/popup.cpp
index df45e2fa21b1b74d94b50c2b413ef9267304f02b..1ccfc7339811e96fd3e1e4e41953dcd2f68e91cf 100644 (file)
--- a/src/programs/view/popup.cpp
+++ b/src/programs/view/popup.cpp
@@ -89,7 +89,7 @@ bool ChildCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
     return false;
 }
 
-bool MenuCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
+bool MenuCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
 {
     t_menu *m;
 

diff --git a/src/programs/view/view.cpp b/src/programs/view/view.cpp
index e751cc098cae01999c4ca80a8c862e133f4ea465..3b19026cbb5f0b025f257530fa665116bf642a05 100644 (file)
--- a/src/programs/view/view.cpp
+++ b/src/programs/view/view.cpp
@@ -227,7 +227,7 @@ static bool HandleClient(t_x11 *x11, int ID, t_gmx *gmx)
     return false;
 }
 
-static bool MainCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
+static bool MainCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
 {
     t_gmx    *gmx;
     int       nsel, width, height;

diff --git a/src/programs/view/x11.cpp b/src/programs/view/x11.cpp
index 49534d1ff4d738906df7821c67ee7f2f06be553b..b3aa8b189c2d820f34fa515dbefe2c7f412c85ad 100644 (file)
--- a/src/programs/view/x11.cpp
+++ b/src/programs/view/x11.cpp
@@ -50,7 +50,7 @@ unsigned long BLACK, BLUE, GREEN, CYAN, RED, BROWN, GREY, DARKGREY;
 /* These colours will be mapped to white on a monochrome screen */
 unsigned long LIGHTBLUE, LIGHTGREEN, LIGHTGREY, LIGHTCYAN, LIGHTRED, VIOLET, YELLOW, WHITE;
 
-static XFontStruct *XLQF(FILE *err, Display *disp, const char *name)
+static XFontStruct *XLQF(FILE gmx_unused *err, Display *disp, const char *name)
 {
     XFontStruct *font = XLoadQueryFont(disp, name);
 #ifdef DEBUG

diff --git a/src/programs/view/xdlgitem.cpp b/src/programs/view/xdlgitem.cpp
index a53ba6811552f92463bf9f2e4b3517d18a6459c2..aa36593a9e3429d57f09f4b05dc39db1c0c3feb2 100644 (file)
--- a/src/programs/view/xdlgitem.cpp
+++ b/src/programs/view/xdlgitem.cpp
@@ -663,7 +663,7 @@ t_dlgitem *CreateCheckBox(t_x11 *x11,
 }
 
 t_dlgitem *CreatePixmap(Pixmap pm, t_id id,
-                        t_id groupid, int x0, int y0, int w, int h, int bw)
+                        t_id /*groupid*/, int x0, int y0, int w, int h, int bw)
 {
     t_dlgitem *dlgitem;