Require 2015 version for MSVC

[alexxy/gromacs.git] / src / gromacs / gmxana / hxprops.cpp

diff --git a/src/gromacs/gmxana/hxprops.cpp b/src/gromacs/gmxana/hxprops.cpp
index 941fac46621a5b37e3f4d9da8b078d87c52eecd6..e5ee9493d2633d2da91c60078d313ac4f0930067 100644 (file)
--- a/src/gromacs/gmxana/hxprops.cpp
+++ b/src/gromacs/gmxana/hxprops.cpp
@@ -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,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.
@@ -58,7 +58,10 @@ real ellipticity(int nres, t_bb bb[])
     typedef struct {
         real phi, psi, w;
     } t_ppwstr;
-
+    // Avoid warnings about narrowing conversions from double to real
+#ifdef _MSC_VER
+#pragma warning(disable: 4838)
+#endif
     static const t_ppwstr ppw[] = {
         {  -67,  -44,  0.31 },
         {  -66,  -41,  0.31 },
@@ -73,6 +76,9 @@ real ellipticity(int nres, t_bb bb[])
         {  -54,  -28,  0.46 },
         {  -44,  -33,  0.68 }
     };
+#ifdef _MSC_VER
+#pragma warning(default: 4838)
+#endif
 #define NPPW asize(ppw)
 
     int        i, j;