Merge branch 'master' into pygromacs

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

diff --git a/src/gromacs/gmxana/gmx_rotacf.c b/src/gromacs/gmxana/gmx_rotacf.cpp
similarity index 98%
rename from src/gromacs/gmxana/gmx_rotacf.c
rename to src/gromacs/gmxana/gmx_rotacf.cpp
index e48fc483f262fa549f38bf5da9608fdefa17dc33..98abcf48ad4dac2012665870de3531010d71320a 100644 (file)
--- a/src/gromacs/gmxana/gmx_rotacf.c
+++ b/src/gromacs/gmxana/gmx_rotacf.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, 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.
@@ -36,8 +36,8 @@
  */
 #include "gmxpre.h"
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/correlationfunctions/autocorr.h"
@@ -155,7 +155,7 @@ int gmx_rotacf(int argc, char *argv[])
     gpbc = gmx_rmpbc_init(&(top->idef), ePBC, natoms);
 
     /* Start the loop over frames */
-    t1      = t0 = t;
+    t0      = t;
     teller  = 0;
     do
     {