Fix ICC warnings

[alexxy/gromacs.git] / src / gromacs / mdlib / shakef.c

diff --git a/src/gromacs/mdlib/shakef.c b/src/gromacs/mdlib/shakef.c
index 950c45a1b56cc4d58555a331d8f15fb7c84b4359..46030d0cbc433debf1702cfc697b04afd36dcd41 100644 (file)
--- a/src/gromacs/mdlib/shakef.c
+++ b/src/gromacs/mdlib/shakef.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, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, 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.
@@ -34,19 +34,16 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
 
 #include <math.h>
-#include "sysstuff.h"
-#include "typedefs.h"
-#include "smalloc.h"
-#include "pbc.h"
-#include "txtdump.h"
-#include "vec.h"
-#include "nrnb.h"
-#include "constr.h"
+
+#include "gromacs/legacyheaders/constr.h"
+#include "gromacs/legacyheaders/nrnb.h"
+#include "gromacs/legacyheaders/txtdump.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/utility/smalloc.h"
 
 typedef struct gmx_shakedata
 {
@@ -264,11 +261,11 @@ int vec_shakef(FILE *fplog, gmx_shakedata_t shaked,
         if (fplog)
         {
             fprintf(fplog, "Inner product between old and new vector <= 0.0!\n"
-                    "constraint #%d atoms %u and %u\n",
+                    "constraint #%d atoms %d and %d\n",
                     error-1, iatom[3*(error-1)+1]+1, iatom[3*(error-1)+2]+1);
         }
         fprintf(stderr, "Inner product between old and new vector <= 0.0!\n"
-                "constraint #%d atoms %u and %u\n",
+                "constraint #%d atoms %d and %d\n",
                 error-1, iatom[3*(error-1)+1]+1, iatom[3*(error-1)+2]+1);
         nit = 0;
     }