Merge branch 'master' into pygromacs

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

diff --git a/src/gromacs/gmxana/nrama.c b/src/gromacs/gmxana/nrama.cpp
similarity index 99%
rename from src/gromacs/gmxana/nrama.c
rename to src/gromacs/gmxana/nrama.cpp
index 165fb75b230750ea630dc639f0789ceab7754515..04bfb5ba9a06d72dfd8e773a16f42c7840108f14 100644 (file)
--- a/src/gromacs/gmxana/nrama.c
+++ b/src/gromacs/gmxana/nrama.cpp
@@ -38,8 +38,7 @@
 
 #include "nrama.h"
 
-#include <math.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "gromacs/listed-forces/bonded.h"
 #include "gromacs/pbcutil/rmpbc.h"
@@ -283,7 +282,6 @@ t_topology *init_rama(const output_env_t oenv, const char *infile,
                       const char *topfile, t_xrama *xr, int mult)
 {
     t_topology *top;
-    int         ePBC;
     real        t;
 
     top = read_top(topfile, &xr->ePBC);