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

convert Error class to accept 'const std::string &' instead of 'const char *'

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-06-03 15:43:05 -04:00
parent 9e8ce240a0
commit 9f3f53cc6b
4 changed files with 73 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/library.cpp
View File

@ -78,12 +78,12 @@ using namespace LAMMPS_NS;
MPI_Comm_size(ae.universe, &nprocs ); \
\
if (nprocs > 1) { \
error->set_last_error(ae.message.c_str(), ERROR_ABORT); \
error->set_last_error(ae.message, ERROR_ABORT); \
} else { \
error->set_last_error(ae.message.c_str(), ERROR_NORMAL); \
error->set_last_error(ae.message, ERROR_NORMAL); \
} \
} catch(LAMMPSException & e) { \
error->set_last_error(e.message.c_str(), ERROR_NORMAL); \
error->set_last_error(e.message, ERROR_NORMAL); \
}
#else
#define BEGIN_CAPTURE
@ -1714,9 +1714,9 @@ int lammps_config_has_exceptions() {
------------------------------------------------------------------------- */
int lammps_has_error(void *ptr) {
LAMMPS * lmp = (LAMMPS *) ptr;
Error * error = lmp->error;
return error->get_last_error() ? 1 : 0;
LAMMPS *lmp = (LAMMPS *)ptr;
Error *error = lmp->error;
return (error->get_last_error() != "") ? 1 : 0;
}
/* ----------------------------------------------------------------------
@ -1727,12 +1727,12 @@ int lammps_has_error(void *ptr) {
------------------------------------------------------------------------- */
int lammps_get_last_error_message(void *ptr, char * buffer, int buffer_size) {
LAMMPS * lmp = (LAMMPS *) ptr;
Error * error = lmp->error;
LAMMPS *lmp = (LAMMPS *)ptr;
Error *error = lmp->error;
if(error->get_last_error()) {
if(error->get_last_error() != "") {
int error_type = error->get_last_error_type();
strncpy(buffer, error->get_last_error(), buffer_size-1);
strncpy(buffer, error->get_last_error().c_str(), buffer_size-1);
error->set_last_error(NULL, ERROR_NONE);
return error_type;
}