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

Merge branch 'develop' into always-exceptions

Browse Source 
# Conflicts:
#	src/library.cpp
This commit is contained in:
Axel Kohlmeyer
2023-08-03 16:46:32 -04:00
parent fc365d3d5f 554db7daaf
commit 4ed98083e0
626 changed files with 8068 additions and 4460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lammps.cpp
View File

@ -135,7 +135,7 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator) :
// append git descriptor info to update string when compiling development or maintenance version
std::string update_string = UPDATE_STRING;
if (has_git_info() && (update_string == " - Development") || (update_string == " - Maintenance"))
if (has_git_info() && ((update_string == " - Development") || (update_string == " - Maintenance")))
update_string += fmt::format(" - {}", git_descriptor());
external_comm = 0;