Converted gmxpreprocess to compile as C++

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / fflibutil.h

diff --git a/src/gromacs/gmxpreprocess/fflibutil.h b/src/gromacs/gmxpreprocess/fflibutil.h
index 4d54ec40057110c99adc75f43352b7c424cbac3d..1c0d6597c0d62a22e9ccc484683f218652126078 100644 (file)
--- a/src/gromacs/gmxpreprocess/fflibutil.h
+++ b/src/gromacs/gmxpreprocess/fflibutil.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2014, by the GROMACS development team, led by
+ * Copyright (c) 2010,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,16 +36,17 @@
 #ifndef GMX_GMXPREPROCESS_FFLIBUTIL_H
 #define GMX_GMXPREPROCESS_FFLIBUTIL_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <stdio.h>
-#include "typedefs.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <vector>
+
+#include "gromacs/utility/basedefinitions.h"
+#include "gromacs/utility/datafilefinder.h"
+
+/*! \brief
+ * Enumerates forcefields in the data directories.
+ */
+std::vector<gmx::DataFileInfo> fflib_enumerate_forcefields();
 
 const char *fflib_forcefield_dir_ext();
 /* Returns the name of the force field directory extension */
@@ -71,12 +72,6 @@ int fflib_search_file_end(const char *ffdir,
  * Return the number of files and the file names in filenames.
  */
 
-int fflib_search_file_in_dirend(const char *filename, const char *dirend,
-                                char ***dirnames);
-/* Search for files with name filename in subdirectories with names
- * ending on dirend.
- * Return the number of files and the directory names in dirnames.
- */
 gmx_bool fflib_fexist(const char *file);
 /* Check if a file exists in the force field library */
 
@@ -86,8 +81,4 @@ FILE *fflib_open(const char *file);
  * either absolute or relative to the current dir.
  */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif