sync with GH

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15746 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
sjplimp
2016-10-11 18:43:51 +00:00
parent 7a4da54a71
commit e710053de6
14 changed files with 205 additions and 130 deletions

View File

@ -1557,5 +1557,5 @@ size_t const colvarmodule::cv_prec = 14;
size_t const colvarmodule::cv_width = 21;
size_t const colvarmodule::en_prec = 14;
size_t const colvarmodule::en_width = 21;
std::string const colvarmodule::line_marker =
const char * const colvarmodule::line_marker = (const char *)
"----------------------------------------------------------------------\n";

View File

@ -366,7 +366,7 @@ public:
/// Number of characters to represent the collective variables energy
static size_t const en_width;
/// Line separator in the log output
static std::string const line_marker;
static const char * const line_marker;
// proxy functions