Merge branch 'release-4-5-patches' into release-4-6

Change-Id: Id4fc52b784ac55c2e57669af391b8d2a70a56695

diff --cc cmake/gmxCFlags.cmake
index 3b9489449f98a2da771cebfed1f67ff12f3c55d2,d7ba7aa7c3c528e609c1c161745cf2150b9c8bfe..f6dbdb126520f552813533a4ed0ea522c0e2997a
--- 1/cmake/gmxCFlags.cmake
--- 2/cmake/gmxCFlags.cmake
+++ b/cmake/gmxCFlags.cmake
@@@ -131,14 -116,14 +131,14 @@@ MACRO(gmx_c_flags
          if(NOT GMX_OPENMP)
              GMX_TEST_CFLAG(CFLAGS_PRAGMA "-Wno-unknown-pragmas" GMXC_CFLAGS)
          endif()
 -        GMX_TEST_CFLAG(CFLAGS_WARN "-Wall -Wno-unused" GMXC_CFLAGS)
 +        GMX_TEST_CFLAG(CFLAGS_WARN "-Wall -Wno-unused -Wunused-value" GMXC_CFLAGS)
      endif()
  
-     if (CMAKE_C_COMPILER_ID MATCHES "Clang")
+     if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
          if(NOT GMX_OPENMP)
-             GMX_TEST_CFLAG(CXXFLAGS_PRAGMA "-Wno-unknown-pragmas" GMXC_CXXFLAGS)
+             GMX_TEST_CXXFLAG(CXXFLAGS_PRAGMA "-Wno-unknown-pragmas" GMXC_CXXFLAGS)
          endif()
 -        GMX_TEST_CXXFLAG(CXXFLAGS_WARN "-Wall -Wno-unused" GMXC_CXXFLAGS)
 +        GMX_TEST_CXXFLAG(CXXFLAGS_WARN "-Wall -Wno-unused -Wunused-value" GMXC_CXXFLAGS)
      endif()
  
      # now actually set the flags:

diff --cc src/kernel/readir.c
Simple merge

diff --cc src/mdlib/sim_util.c
Simple merge

diff --cc src/tools/gmx_bar.c
Simple merge