Merge branch 'master' into pygromacs

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

diff --git a/src/gromacs/gmxana/gmx_saxs.c b/src/gromacs/gmxana/gmx_saxs.cpp
similarity index 97%
rename from src/gromacs/gmxana/gmx_saxs.c
rename to src/gromacs/gmxana/gmx_saxs.cpp
index 30967feab71464ac42c24f784e2984a6f2594ab8..de51400a29c6704108eda4b9b348a7d228706c68 100644 (file)
--- a/src/gromacs/gmxana/gmx_saxs.c
+++ b/src/gromacs/gmxana/gmx_saxs.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by
+ * Copyright (c) 2012,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.
@@ -37,7 +37,7 @@
 
 #include "gmxpre.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/gmxana/gmx_ana.h"