Commit 977b9e54 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

update colvars to another set of changes from the upstream repo 

(cherry picked from commit cb816f8cba630e27df773b54a584b72741fa20db)
parent 1b33d007

lib/colvars/colvar.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1952,4 +1952,4 @@ void colvar::calc_runave() 


// Static members



std::vector<cvm::deps::feature *> colvar::cv_features;
 
std::vector<colvardeps::feature *> colvar::cv_features;

lib/colvars/colvar.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
/// \link colvarvalue \endlink type, you should also add its

/// initialization line in the \link colvar \endlink constructor.



class colvar : public colvarparse, public cvm::deps {

class colvar : public colvarparse, public colvardeps {



public:

lib/colvars/colvaratoms.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1192,6 +1192,6 @@ void cvm::atom_group::apply_force(cvm::rvector const &force) 


// Static members



std::vector<cvm::deps::feature *> cvm::atom_group::ag_features;

std::vector<colvardeps::feature *> cvm::atom_group::ag_features;

lib/colvars/colvaratoms.h

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ public: 
/// \brief Group of \link atom \endlink objects, mostly used by a

/// \link cvc \endlink object to gather all atomic data

class colvarmodule::atom_group

  : public colvarparse, public cvm::deps

  : public colvarparse, public colvardeps

{

public:

lib/colvars/colvarbias.cpp

+1 −1
Original line number Diff line number Diff line
@@ -246,4 +246,4 @@ std::ostream & colvarbias::write_traj(std::ostream &os) 


// Static members



std::vector<cvm::deps::feature *> colvarbias::cvb_features;
 
std::vector<colvardeps::feature *> colvarbias::cvb_features;

CRA Git | Maintained and supported by SUSTech CRA and CCSE