Converted gmxpreprocess to compile as C++

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / read-conformation.h

diff --git a/src/gromacs/gmxpreprocess/read-conformation.h b/src/gromacs/gmxpreprocess/read-conformation.h
index 4a1704d5cef5ab0141c46c28a088f8a74088b2f7..7c9f6a27fd1d6045deb8ec8a2c4f175ba1473d55 100644 (file)
--- a/src/gromacs/gmxpreprocess/read-conformation.h
+++ b/src/gromacs/gmxpreprocess/read-conformation.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2014, by the GROMACS development team, led by
+ * Copyright (c) 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.
@@ -35,11 +35,7 @@
 #ifndef GMX_GMXPREPROCESS_READ_CONFORMATION_H
 #define GMX_GMXPREPROCESS_READ_CONFORMATION_H
 
-#include "types/simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "gromacs/legacyheaders/types/simple.h"
 
 struct gmx_atomprop;
 struct t_atoms;
@@ -59,10 +55,6 @@ real *makeExclusionDistances(const struct t_atoms *a, struct gmx_atomprop *aps,
  * *v should be freed by the caller. atoms should have its destructor
  * called. */
 char *readConformation(const char *confin, struct t_atoms *atoms, rvec **x, rvec **v,
-                       int *ePBC, matrix box);
-
-#ifdef __cplusplus
-}
-#endif
+                       int *ePBC, matrix box, const char *statusTitle);
 
 #endif