From 7e78738c7374cb30b6c73d57ec5c9c016944a756 Mon Sep 17 00:00:00 2001 From: "Steven J. Plimpton" Date: Fri, 9 Feb 2018 14:26:21 -0700 Subject: [PATCH 1/2] patch 5Feb18 --- doc/src/Manual.txt | 4 ++-- src/version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/Manual.txt b/doc/src/Manual.txt index 1a4d2eb779..3ef5a11cd5 100644 --- a/doc/src/Manual.txt +++ b/doc/src/Manual.txt @@ -1,7 +1,7 @@ LAMMPS Users Manual - + @@ -21,7 +21,7 @@

LAMMPS Documentation :c,h3 -17 Jan 2018 version :c,h4 +5 Feb 2018 version :c,h4 Version info: :h4 diff --git a/src/version.h b/src/version.h index f544f0203c..ad4b632883 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define LAMMPS_VERSION "17 Jan 2018" +#define LAMMPS_VERSION "5 Feb 2018" From b220b647d46b458d67ef8a5a36f0fca9d5772f57 Mon Sep 17 00:00:00 2001 From: Evangelos Voyiatzis Date: Fri, 16 Feb 2018 10:49:08 +0100 Subject: [PATCH 2/2] Update error.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When compiling with g++ (GCC) 4.4.7 20120313 (Red Hat 4.4.7-18) an error occurs: error.cpp: In member function ‘void Error::generate_error(unsigned int, std::string, std::string)’: error.cpp:146: error: ‘exit’ was not declared in this scope The fix is to include the #include where the exit() function is decleared in the error.cpp file --- tools/pymol_asphere/src/error.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/pymol_asphere/src/error.cpp b/tools/pymol_asphere/src/error.cpp index 0bbd090566..9491ca04a4 100644 --- a/tools/pymol_asphere/src/error.cpp +++ b/tools/pymol_asphere/src/error.cpp @@ -13,7 +13,8 @@ #include "error.h" #include - +#include + Notice::Notice() { nullout=new ostream(NULL); noteout=&cout;