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 13386af2ee369db78be967f3f18bc95000b44a34..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,13 +35,10 @@
 #ifndef GMX_GMXPREPROCESS_READ_CONFORMATION_H
 #define GMX_GMXPREPROCESS_READ_CONFORMATION_H
 
-#include "types/simple.h"
-#include "types/atoms.h"
-#include "atomprop.h"
+#include "gromacs/legacyheaders/types/simple.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+struct gmx_atomprop;
+struct t_atoms;
 
 /*! \brief Allocate and fill an array of inter-atomic half distances
  *
@@ -49,7 +46,7 @@ extern "C" {
  * default value. Used directly and indirectly by solvate and
  * insert-molecules for deciding whether molecules clash. The return
  * pointer should be freed by the caller. */
-real *makeExclusionDistances(const t_atoms *a, gmx_atomprop_t aps,
+real *makeExclusionDistances(const struct t_atoms *a, struct gmx_atomprop *aps,
                              real defaultDistance, real scaleFactor);
 
 /*! \brief Read a conformation from a file, allocate and fill data structures.
@@ -57,11 +54,7 @@ real *makeExclusionDistances(const t_atoms *a, gmx_atomprop_t aps,
  * Used by solvate and insert-molecules. The returned pointers *x and
  * *v should be freed by the caller. atoms should have its destructor
  * called. */
-char *readConformation(const char *confin, t_atoms *atoms, rvec **x, rvec **v,
-                       int *ePBC, matrix box);
-
-#ifdef __cplusplus
-}
-#endif
+char *readConformation(const char *confin, struct t_atoms *atoms, rvec **x, rvec **v,
+                       int *ePBC, matrix box, const char *statusTitle);
 
 #endif