Forward declare ArrayRef more and inlcude basedefinitions where needed

[alexxy/gromacs.git] / src / gromacs / commandline / filenm.h

diff --git a/src/gromacs/commandline/filenm.h b/src/gromacs/commandline/filenm.h
index 5cc0e620a15b1781a7f0962311abea25de300f70..1a3c8a80bb6f2596c3585a1c291d8c7b1aed969e 100644 (file)
--- a/src/gromacs/commandline/filenm.h
+++ b/src/gromacs/commandline/filenm.h
@@ -4,7 +4,7 @@
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
  * Copyright (c) 2013,2014,2015,2016,2017 by the GROMACS development team.
- * Copyright (c) 2018,2019,2020, by the GROMACS development team, led by
+ * Copyright (c) 2018,2019,2020,2021, 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.
@@ -50,7 +50,6 @@
 #include <vector>
 
 #include "gromacs/fileio/filetypes.h"
-#include "gromacs/utility/basedefinitions.h"
 
 
 //! \addtogroup module_commandline
@@ -149,10 +148,10 @@ gmx::ArrayRef<const std::string> ftp2fns(int ftp, int nfile, const t_filenm fnm[
 #define ftp2FILE(ftp, nfile, fnm, mode) gmx_ffopen(ftp2fn(ftp, nfile, fnm), mode)
 
 //! Returns TRUE when this file type has been found on the cmd-line.
-gmx_bool ftp2bSet(int ftp, int nfile, const t_filenm fnm[]);
+bool ftp2bSet(int ftp, int nfile, const t_filenm fnm[]);
 
 //! Returns TRUE when this option has been found on the cmd-line.
-gmx_bool opt2bSet(const char* opt, int nfile, const t_filenm fnm[]);
+bool opt2bSet(const char* opt, int nfile, const t_filenm fnm[]);
 
 /*! \brief
  * Returns the file name belonging top cmd-line option opt, or NULL when
@@ -170,13 +169,13 @@ const char* opt2fn_null(const char* opt, int nfile, const t_filenm fnm[]);
 const char* ftp2fn_null(int ftp, int nfile, const t_filenm fnm[]);
 
 //! Returns whether or not this filenm is optional.
-gmx_bool is_optional(const t_filenm* fnm);
+bool is_optional(const t_filenm* fnm);
 
 //! Returns whether or not this filenm is output.
-gmx_bool is_output(const t_filenm* fnm);
+bool is_output(const t_filenm* fnm);
 
 //! Returns whether or not this filenm is set.
-gmx_bool is_set(const t_filenm* fnm);
+bool is_set(const t_filenm* fnm);
 
 /*! \brief Return whether \c filename might have been produced by mdrun -noappend.
  *