ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct function prototypes

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-12-30 23:48:42 -05:00
parent e6e9aed385
commit ca3be99e77
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils.cpp
View File

@ -422,7 +422,7 @@ int utils::inumeric(const char *file, int line, const std::string &str, bool do_
wrapper for inumeric() that accepts a char pointer instead of a string wrapper for inumeric() that accepts a char pointer instead of a string
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
double utils::inumeric(const char *file, int line, const char *str, bool do_abort, LAMMPS *lmp) int utils::inumeric(const char *file, int line, const char *str, bool do_abort, LAMMPS *lmp)
{ {
if (str) if (str)
return inumeric(file, line, std::string(str), do_abort, lmp); return inumeric(file, line, std::string(str), do_abort, lmp);
@ -467,7 +467,7 @@ bigint utils::bnumeric(const char *file, int line, const std::string &str, bool
wrapper for bnumeric() that accepts a char pointer instead of a string wrapper for bnumeric() that accepts a char pointer instead of a string
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
double utils::bnumeric(const char *file, int line, const char *str, bool do_abort, LAMMPS *lmp) bigint utils::bnumeric(const char *file, int line, const char *str, bool do_abort, LAMMPS *lmp)
{ {
if (str) if (str)
return bnumeric(file, line, std::string(str), do_abort, lmp); return bnumeric(file, line, std::string(str), do_abort, lmp);
@ -512,7 +512,7 @@ tagint utils::tnumeric(const char *file, int line, const std::string &str, bool
wrapper for tnumeric() that accepts a char pointer instead of a string wrapper for tnumeric() that accepts a char pointer instead of a string
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
double utils::tnumeric(const char *file, int line, const char *str, bool do_abort, LAMMPS *lmp) tagint utils::tnumeric(const char *file, int line, const char *str, bool do_abort, LAMMPS *lmp)
{ {
if (str) if (str)
return tnumeric(file, line, std::string(str), do_abort, lmp); return tnumeric(file, line, std::string(str), do_abort, lmp);

6
src/utils.h
View File

@ -226,7 +226,7 @@ namespace utils {
* \param lmp pointer to top-level LAMMPS class instance * \param lmp pointer to top-level LAMMPS class instance
* \return double precision floating point number */ * \return double precision floating point number */
double inumeric(const char *file, int line, const char *str, bool do_abort, LAMMPS *lmp); int inumeric(const char *file, int line, const char *str, bool do_abort, LAMMPS *lmp);
/*! Convert a string to an integer number while checking /*! Convert a string to an integer number while checking
* if it is a valid integer number (bigint) * if it is a valid integer number (bigint)
@ -249,7 +249,7 @@ namespace utils {
* \param lmp pointer to top-level LAMMPS class instance * \param lmp pointer to top-level LAMMPS class instance
* \return double precision floating point number */ * \return double precision floating point number */
double bnumeric(const char *file, int line, const char *str, bool do_abort, LAMMPS *lmp); bigint bnumeric(const char *file, int line, const char *str, bool do_abort, LAMMPS *lmp);
/*! Convert a string to an integer number while checking /*! Convert a string to an integer number while checking
* if it is a valid integer number (tagint) * if it is a valid integer number (tagint)
@ -272,7 +272,7 @@ namespace utils {
* \param lmp pointer to top-level LAMMPS class instance * \param lmp pointer to top-level LAMMPS class instance
* \return double precision floating point number */ * \return double precision floating point number */
double tnumeric(const char *file, int line, const char *str, bool do_abort, LAMMPS *lmp); tagint tnumeric(const char *file, int line, const char *str, bool do_abort, LAMMPS *lmp);
/*! Compute index bounds derived from a string with a possible wildcard /*! Compute index bounds derived from a string with a possible wildcard
* *