From 3abe60198a85261dcb10bb74a18d47c49651c732 Mon Sep 17 00:00:00 2001 From: Roland Schulz Date: Sat, 28 Feb 2015 16:51:32 -0500 Subject: [PATCH] Fix GCC5 warnings Change-Id: I61d2a1f427b12dc2530dd8929d8b90646c1faefc --- src/gromacs/fileio/tpxio.c | 4 ++-- src/gromacs/imd/imd.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gromacs/fileio/tpxio.c b/src/gromacs/fileio/tpxio.c index 4fba747508..0ca368e5c7 100644 --- a/src/gromacs/fileio/tpxio.c +++ b/src/gromacs/fileio/tpxio.c @@ -3,7 +3,7 @@ * * Copyright (c) 1991-2000, University of Groningen, The Netherlands. * Copyright (c) 2001-2004, The GROMACS development team. - * Copyright (c) 2013,2014, by the GROMACS development team, led by + * Copyright (c) 2013,2014,2015, by the GROMACS development team, led by * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, * and including many others, as listed in the AUTHORS file in the * top-level source directory and at http://www.gromacs.org. @@ -3233,7 +3233,7 @@ static void do_tpxheader(t_fileio *fio, gmx_bool bRead, t_tpxheader *tpx, /* We only support reading tpx files with the same tag as the code * or tpx files with the release tag and with lower version number. */ - if (!strcmp(file_tag, TPX_TAG_RELEASE) == 0 && fver < tpx_version) + if (strcmp(file_tag, TPX_TAG_RELEASE) != 0 && fver < tpx_version) { gmx_fatal(FARGS, "tpx tag/version mismatch: reading tpx file (%s) version %d, tag '%s' with program for tpx version %d, tag '%s'", gmx_fio_getname(fio), fver, file_tag, diff --git a/src/gromacs/imd/imd.c b/src/gromacs/imd/imd.c index 7c608c7bd5..36eed97850 100644 --- a/src/gromacs/imd/imd.c +++ b/src/gromacs/imd/imd.c @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2014, by the GROMACS development team, led by + * Copyright (c) 2014,2015, by the GROMACS development team, led by * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, * and including many others, as listed in the AUTHORS file in the * top-level source directory and at http://www.gromacs.org. @@ -616,7 +616,7 @@ static gmx_bool imd_tryconnect(t_gmx_IMD_setup *IMDsetup) static void imd_blockconnect(t_gmx_IMD_setup *IMDsetup) { /* do not wait for connection, when e.g. ctrl+c is pressed and we will terminate anyways. */ - if (!(int) gmx_get_stop_condition() == gmx_stop_cond_none) + if (gmx_get_stop_condition() != gmx_stop_cond_none) { return; } -- 2.22.0