Merge branch 'develop' into always-exceptions

# Conflicts: # src/library.cpp
2023-08-03 16:46:32 -04:00
parent fc365d3d5f 554db7daaf
commit 4ed98083e0
626 changed files with 8068 additions and 4460 deletions
--- a/examples/COUPLE/plugin/liblammpsplugin.h
+++ b/examples/COUPLE/plugin/liblammpsplugin.h
@ -239,7 +239,7 @@ struct _liblammpsplugin {

  void (*free)(void *);

-  void (*is_running)(void *);
+  int (*is_running)(void *);
  void (*force_timeout)(void *);

  int (*has_error)(void *);