From d5d1010de538d114244da7ab3d271ab5d0114b79 Mon Sep 17 00:00:00 2001 From: Roland Schulz Date: Fri, 5 Jun 2015 05:23:46 -0400 Subject: [PATCH] Remove unnecessary ICC warning suppression Change-Id: Icdb24d0fed40608a11a884fe5181778180bcc5e2 --- cmake/gmxCFlags.cmake | 57 +++++++--------------------------------- src/gromacs/domdec/domdec.cpp | 4 +-- src/gromacs/fft/fft_mkl.cpp | 22 ++++++++-------- src/gromacs/gmxana/gmx_hbond.cpp | 8 +++--- 4 files changed, 27 insertions(+), 64 deletions(-) diff --git a/cmake/gmxCFlags.cmake b/cmake/gmxCFlags.cmake index 69bc7956f2..b89bada654 100644 --- a/cmake/gmxCFlags.cmake +++ b/cmake/gmxCFlags.cmake @@ -148,28 +148,12 @@ macro (gmx_c_flags) if (CMAKE_C_COMPILER_ID MATCHES "Intel") if (NOT WIN32) if(NOT GMX_OPENMP) - if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 13.99.99) # 3180: unrecognized OpenMP #pragma - GMX_TEST_CFLAG(CFLAGS_PRAGMA "-wd3180" GMXC_CFLAGS) - else() -# 161: unrecognized #pragma - GMX_TEST_CFLAG(CFLAGS_PRAGMA "-wd161" GMXC_CFLAGS) - endif() + GMX_TEST_CFLAG(CFLAGS_PRAGMA "-wd3180" GMXC_CFLAGS) endif() if (GMX_COMPILER_WARNINGS) - if(CMAKE_C_COMPILER_VERSION VERSION_LESS 15.00.00) -# 193: zero used for undefined preprocessing identifier ".." - GMX_TEST_CFLAG(CFLAGS_WARN_OLD -wd193 GMXC_CFLAGS) - endif() # 177: function/variable ".." was declared but never referenced -# 271: trailing comma is nonstandard -# 304: access control not specified ("public" by default) -# 383: value copied to temporary, reference to temporary used -# 424: extra ";" ignored -# 444: destructor for base class ".." is not virtual -# 522: function ".." redeclared "inline" after being called # 593: variable ".." was set but never used -# 869: parameter ".." was never referenced # 981: operands are evaluated in unspecified order #1418: external function definition with no prior declaration #1419: external declaration in primary source file @@ -180,10 +164,9 @@ macro (gmx_c_flags) #2547: ".." was specified as both a system and non-system include directory #2557: comparison between signed and unsigned operands #3280: declaration hides member ".." -#3346: dynamic exception specifications are deprecated #11074: Inlining inhibited by limit max-size(/max-total-size) #11076: To get full report use -opt-report=3 -opt-report-phase ipo (shown for previous remark) - GMX_TEST_CFLAG(CFLAGS_WARN "-w3 -wd177 -wd271 -wd304 -wd383 -wd424 -wd444 -wd522 -wd593 -wd869 -wd981 -wd1418 -wd1419 -wd1572 -wd1599 -wd2259 -wd2415 -wd2547 -wd2557 -wd3280 -wd3346 -wd11074 -wd11076" GMXC_CFLAGS) + GMX_TEST_CFLAG(CFLAGS_WARN "-w3 -wd177 -wd593 -wd981 -wd1418 -wd1419 -wd1572 -wd1599 -wd2259 -wd2415 -wd2547 -wd2557 -wd3280 -wd11074 -wd11076" GMXC_CFLAGS) endif() GMX_TEST_CFLAG(CFLAGS_STDGNU "-std=gnu99" GMXC_CFLAGS) GMX_TEST_CFLAG(CFLAGS_OPT "-ip -funroll-all-loops -alias-const -ansi-alias" GMXC_CFLAGS_RELEASE) @@ -191,17 +174,10 @@ macro (gmx_c_flags) GMX_TEST_CFLAG(CFLAGS_FP_RELASSERT "-fp-model except -fp-model precise" GMXC_CFLAGS_RELWITHASSERT) else() if(NOT GMX_OPENMP) - if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 13.99.99) - GMX_TEST_CFLAG(CFLAGS_PRAGMA "/wd3180" GMXC_CFLAGS) - else() - GMX_TEST_CFLAG(CFLAGS_PRAGMA "/wd161" GMXC_CFLAGS) - endif() + GMX_TEST_CFLAG(CFLAGS_PRAGMA "/wd3180" GMXC_CFLAGS) endif() if (GMX_COMPILER_WARNINGS) - if(CMAKE_C_COMPILER_VERSION VERSION_LESS 15.00.00) - GMX_TEST_CFLAG(CFLAGS_WARN_OLD /wd193 GMXC_CFLAGS) - endif() - GMX_TEST_CFLAG(CFLAGS_WARN "/W3 /wd177 /wd271 /wd304 /wd383 /wd424 /wd444 /wd522 /wd593 /wd869 /wd981 /wd1418 /wd1419 /wd1572 /wd1599 /wd2259 /wd2415 /wd2547 /wd2557 /wd3280 /wd3346" GMXC_CFLAGS) + GMX_TEST_CFLAG(CFLAGS_WARN "/W3 /wd177 /wd593 /wd981 /wd1418 /wd1419 /wd1572 /wd1599 /wd2259 /wd2415 /wd2547 /wd2557 /wd3280" GMXC_CFLAGS) endif() GMX_TEST_CFLAG(CFLAGS_OPT "/Qip" GMXC_CFLAGS_RELEASE) endif() @@ -210,37 +186,24 @@ macro (gmx_c_flags) if (CMAKE_CXX_COMPILER_ID MATCHES "Intel") if (NOT WIN32) if(NOT GMX_OPENMP) - if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.99.99) - GMX_TEST_CXXFLAG(CXXFLAGS_PRAGMA "-wd3180" GMXC_CXXFLAGS) - else() - GMX_TEST_CXXFLAG(CXXFLAGS_PRAGMA "-wd161" GMXC_CXXFLAGS) - endif() + GMX_TEST_CXXFLAG(CXXFLAGS_PRAGMA "-wd3180" GMXC_CXXFLAGS) endif() if (GMX_COMPILER_WARNINGS) - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.00.00) - GMX_TEST_CXXFLAG(CXXFLAGS_WARN_OLD -wd193 GMXC_CXXFLAGS) - endif() #All but the following warnings are identical for the C-compiler (see above) -#1782: #pragma once is obsolete +# 383: value copied to temporary, reference to temporary used +# 444: destructor for base class ".." is not virtual #2282: unrecognized GCC pragma - GMX_TEST_CXXFLAG(CXXFLAGS_WARN "-w3 -wd177 -wd271 -wd304 -wd383 -wd424 -wd444 -wd522 -wd593 -wd869 -wd981 -wd1418 -wd1419 -wd1572 -wd1599 -wd2259 -wd2415 -wd2547 -wd2557 -wd3280 -wd3346 -wd11074 -wd11076 -wd1782 -wd2282" GMXC_CXXFLAGS) + GMX_TEST_CXXFLAG(CXXFLAGS_WARN "-w3 -wd177 -wd383 -wd444 -wd981 -wd1418 -wd1572 -wd1599 -wd2259 -wd3280 -wd11074 -wd11076 -wd2282" GMXC_CXXFLAGS) endif() GMX_TEST_CXXFLAG(CXXFLAGS_OPT "-ip -funroll-all-loops -alias-const -ansi-alias" GMXC_CXXFLAGS_RELEASE) GMX_TEST_CXXFLAG(CXXFLAGS_DEBUG "-O0" GMXC_CXXFLAGS_DEBUG) GMX_TEST_CXXFLAG(CXXFLAGS_FP_RELASSERT "-fp-model except -fp-model precise" GMXC_CXXFLAGS_RELWITHASSERT) else() if(NOT GMX_OPENMP) - if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.99.99) - GMX_TEST_CXXFLAG(CXXFLAGS_PRAGMA "/wd3180" GMXC_CFLAGS) - else() - GMX_TEST_CXXFLAG(CXXFLAGS_PRAGMA "/wd161" GMXC_CXXFLAGS) - endif() + GMX_TEST_CXXFLAG(CXXFLAGS_PRAGMA "/wd3180" GMXC_CFLAGS) endif() if (GMX_COMPILER_WARNINGS) - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.00.00) - GMX_TEST_CXXFLAG(CXXFLAGS_WARN_OLD /wd193 GMXC_CXXFLAGS) - endif() - GMX_TEST_CXXFLAG(CXXFLAGS_WARN "/W3 /wd177 /wd271 /wd304 /wd383 /wd424 /wd444 /wd522 /wd593 /wd869 /wd981 /wd1418 /wd1419 /wd1572 /wd1599 /wd2259 /wd2415 /wd2547 /wd2557 /wd3280 /wd3346 /wd1782 /wd2282" GMXC_CXXFLAGS) + GMX_TEST_CXXFLAG(CXXFLAGS_WARN "/W3 /wd177 /wd383 /wd444 /wd981 /wd1418 /wd1572 /wd1599 /wd2259 /wd3280 /wd11074 /wd11076 /wd2282" GMXC_CXXFLAGS) endif() GMX_TEST_CXXFLAG(CXXFLAGS_OPT "/Qip" GMXC_CXXFLAGS_RELEASE) endif() diff --git a/src/gromacs/domdec/domdec.cpp b/src/gromacs/domdec/domdec.cpp index 84017c0793..21e6e2506c 100644 --- a/src/gromacs/domdec/domdec.cpp +++ b/src/gromacs/domdec/domdec.cpp @@ -5716,8 +5716,8 @@ static void make_pp_communicator(FILE *fplog, } } -static void receive_ddindex2simnodeid(gmx_domdec_t *dd, - t_commrec gmx_unused *cr) +static void receive_ddindex2simnodeid(gmx_domdec_t gmx_unused *dd, + t_commrec gmx_unused *cr) { #if GMX_MPI gmx_domdec_comm_t *comm = dd->comm; diff --git a/src/gromacs/fft/fft_mkl.cpp b/src/gromacs/fft/fft_mkl.cpp index ee86ced85e..9eede3a331 100644 --- a/src/gromacs/fft/fft_mkl.cpp +++ b/src/gromacs/fft/fft_mkl.cpp @@ -2,7 +2,7 @@ * This file is part of the GROMACS molecular simulation package. * * Copyright (c) 1991-2003 David van der Spoel, Erik Lindahl, University of Groningen. - * Copyright (c) 2013,2014,2015, by the GROMACS development team, led by + * Copyright (c) 2013,2014,2015,2016, 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. @@ -111,9 +111,9 @@ struct gmx_fft int -gmx_fft_init_1d(gmx_fft_t * pfft, - int nx, - gmx_fft_flag flags) +gmx_fft_init_1d(gmx_fft_t * pfft, + int nx, + gmx_fft_flag gmx_unused flags) { gmx_fft_t fft; int d; @@ -187,9 +187,9 @@ gmx_fft_init_1d(gmx_fft_t * pfft, int -gmx_fft_init_1d_real(gmx_fft_t * pfft, - int nx, - gmx_fft_flag flags) +gmx_fft_init_1d_real(gmx_fft_t * pfft, + int nx, + gmx_fft_flag gmx_unused flags) { gmx_fft_t fft; int d; @@ -271,10 +271,10 @@ gmx_fft_init_1d_real(gmx_fft_t * pfft, int -gmx_fft_init_2d_real(gmx_fft_t * pfft, - int nx, - int ny, - gmx_fft_flag flags) +gmx_fft_init_2d_real(gmx_fft_t * pfft, + int nx, + int ny, + gmx_fft_flag gmx_unused flags) { gmx_fft_t fft; int d; diff --git a/src/gromacs/gmxana/gmx_hbond.cpp b/src/gromacs/gmxana/gmx_hbond.cpp index 2081edd40f..79a0be173f 100644 --- a/src/gromacs/gmxana/gmx_hbond.cpp +++ b/src/gromacs/gmxana/gmx_hbond.cpp @@ -912,8 +912,8 @@ static void reset_nhbonds(t_donors *ddd) } } -void pbc_correct_gem(rvec dx, matrix box, rvec hbox); -void pbc_in_gridbox(rvec dx, matrix box); +static void pbc_correct_gem(rvec dx, matrix box, rvec hbox); +static void pbc_in_gridbox(rvec dx, matrix box); static void build_grid(t_hbdata *hb, rvec x[], rvec xshell, gmx_bool bBox, matrix box, rvec hbox, @@ -1186,7 +1186,7 @@ static void free_grid(ivec ngrid, t_gridcell ****grid) g = NULL; } -void pbc_correct_gem(rvec dx, matrix box, rvec hbox) +static void pbc_correct_gem(rvec dx, matrix box, rvec hbox) { int m; gmx_bool bDone = FALSE; @@ -1209,7 +1209,7 @@ void pbc_correct_gem(rvec dx, matrix box, rvec hbox) } } -void pbc_in_gridbox(rvec dx, matrix box) +static void pbc_in_gridbox(rvec dx, matrix box) { int m; gmx_bool bDone = FALSE; -- 2.11.4.GIT