Merge pull request #1321 from akohlmey/collected-small-fixes

Collected small fixes for the next patch release
2019-02-08 17:19:01 +01:00
parent 8b449e569b 1b4ed9cb8d
commit b871b4e13d
44 changed files with 123 additions and 137 deletions
--- a/src/PYTHON/pair_python.cpp
+++ b/src/PYTHON/pair_python.cpp
@ -401,9 +401,9 @@ double PairPython::init_one(int, int)

 /* ---------------------------------------------------------------------- */

-double PairPython::single(int i, int j, int itype, int jtype, double rsq,
-                         double factor_coul, double factor_lj,
-                         double &fforce)
+double PairPython::single(int /* i */, int /* j */, int itype, int jtype,
+                         double rsq, double /* factor_coul */,
+                         double factor_lj, double &fforce)
 {
  // with hybrid/overlay we might get called for skipped types
  if (skip_types[itype] || skip_types[jtype]) {