From 722af3dec1a82b68d2f22d275e68362e6d47eee3 Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Fri, 10 May 2013 12:17:35 +0200
Subject: [PATCH] Fixed warnings
clang -Wextra-semi
---
src/bias/MetaD.cpp | 2 +-
src/colvar/ContactMap.cpp | 2 +-
src/colvar/PathMSDBase.h | 4 ++--
src/core/Action.h | 8 ++++----
src/core/ActionAtomistic.h | 2 +-
src/core/ActionRegister.h | 4 ++--
src/core/ActionSetup.h | 4 ++--
src/core/ActionWithArguments.h | 2 +-
src/core/Atoms.h | 28 ++++++++++++++--------------
src/core/CLTool.h | 4 ++--
src/core/CLToolRegister.h | 4 ++--
src/core/Colvar.h | 4 ++--
src/core/MDAtoms.h | 2 +-
src/core/PlumedMain.h | 2 +-
src/core/PlumedMainInitializer.cpp | 2 +-
src/core/TargetDist.h | 2 +-
src/function/FuncPathMSD.cpp | 6 +++---
src/function/Function.h | 2 +-
src/generic/Debug.cpp | 2 +-
src/generic/DumpAtoms.cpp | 4 ++--
src/generic/DumpDerivatives.cpp | 6 +++---
src/generic/DumpForces.cpp | 6 +++---
src/generic/DumpProjections.cpp | 6 +++---
src/generic/Flush.cpp | 2 +-
src/generic/Group.cpp | 4 ++--
src/generic/Include.cpp | 4 ++--
src/generic/Print.cpp | 6 +++---
src/generic/Read.cpp | 2 +-
src/generic/Time.cpp | 2 +-
src/generic/WholeMolecules.cpp | 2 +-
src/multicolvar/ActionVolume.h | 2 +-
src/multicolvar/MultiColvar.h | 2 +-
src/multicolvar/MultiColvarBase.h | 2 +-
src/tools/DRMSD.h | 2 +-
src/tools/Exception.h | 2 +-
src/tools/FileBase.h | 2 +-
src/tools/Grid.h | 22 +++++++++++-----------
src/tools/NeighborList.h | 2 +-
src/tools/Random.h | 6 +++---
src/vesselbase/Vessel.h | 2 +-
src/vesselbase/VesselRegister.h | 4 ++--
41 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/src/bias/MetaD.cpp b/src/bias/MetaD.cpp
index 02edea904..490495dd0 100644
--- a/src/bias/MetaD.cpp
+++ b/src/bias/MetaD.cpp
@@ -160,7 +160,7 @@ public:
void calculate();
void update();
static void registerKeywords(Keywords& keys);
- bool checkNeedsGradients()const{if(adaptive_==FlexibleBin::geometry){return true;}else{return false;}};
+ bool checkNeedsGradients()const{if(adaptive_==FlexibleBin::geometry){return true;}else{return false;}}
};
PLUMED_REGISTER_ACTION(MetaD,"METAD")
diff --git a/src/colvar/ContactMap.cpp b/src/colvar/ContactMap.cpp
index b53ad3055..914df1d90 100644
--- a/src/colvar/ContactMap.cpp
+++ b/src/colvar/ContactMap.cpp
@@ -62,7 +62,7 @@ public:
~ContactMap();
// active methods:
virtual void calculate();
- void checkFieldsAllowed(){};
+ void checkFieldsAllowed(){}
};
PLUMED_REGISTER_ACTION(ContactMap,"CONTACTMAP")
diff --git a/src/colvar/PathMSDBase.h b/src/colvar/PathMSDBase.h
index 702226f8a..ce2d62e37 100644
--- a/src/colvar/PathMSDBase.h
+++ b/src/colvar/PathMSDBase.h
@@ -53,12 +53,12 @@ class PathMSDBase : public Colvar {
struct imgOrderByDist {
bool operator ()(ImagePath const& a, ImagePath const& b) {
return (a).distance < (b).distance;
- };
+ }
};
struct imgOrderBySimilarity {
bool operator ()(ImagePath const& a, ImagePath const& b) {
return (a).similarity > (b).similarity;
- };
+ }
};
double lambda;
diff --git a/src/core/Action.h b/src/core/Action.h
index 183637162..27d3d3085 100644
--- a/src/core/Action.h
+++ b/src/core/Action.h
@@ -169,8 +169,8 @@ public:
/// Register all the relevant keywords for the action
static void registerKeywords( Keywords& keys );
- virtual void lockRequests(){};
- virtual void unlockRequests(){};
+ virtual void lockRequests(){}
+ virtual void unlockRequests(){}
/// Calculate an Action.
/// This method is called one or more times per step.
@@ -185,12 +185,12 @@ public:
/// Update.
/// This method is called one time per step.
/// The set of all Actions is updated in forward order.
- virtual void update(){};
+ virtual void update(){}
/// RunFinalJobs
/// This method is called once at the very end of the calculation.
/// The set of all Actions in run for the final time in forward order.
- virtual void runFinalJobs(){};
+ virtual void runFinalJobs(){}
/// Tell to the Action to flush open files
void fflush();
diff --git a/src/core/ActionAtomistic.h b/src/core/ActionAtomistic.h
index 527ba50ed..70a5e0be9 100644
--- a/src/core/ActionAtomistic.h
+++ b/src/core/ActionAtomistic.h
@@ -85,7 +85,7 @@ public:
/// Get a reference to force on energy
double & modifyForceOnEnergy();
/// Get number of available atoms
- unsigned getNumberOfAtoms()const{return indexes.size();};
+ unsigned getNumberOfAtoms()const{return indexes.size();}
/// Compute the pbc distance between two positions
Vector pbcDistance(const Vector&,const Vector&)const;
/// Get the vector of absolute indexes
diff --git a/src/core/ActionRegister.h b/src/core/ActionRegister.h
index 542d79358..76de68d62 100644
--- a/src/core/ActionRegister.h
+++ b/src/core/ActionRegister.h
@@ -103,8 +103,8 @@ std::ostream & operator<<(std::ostream &log,const ActionRegister&ar);
static class classname##RegisterMe{ \
static PLMD::Action* create(const PLMD::ActionOptions&ao){return new classname(ao);} \
public: \
- classname##RegisterMe(){PLMD::actionRegister().add(directive,create,classname::registerKeywords);}; \
- ~classname##RegisterMe(){PLMD::actionRegister().remove(create);}; \
+ classname##RegisterMe(){PLMD::actionRegister().add(directive,create,classname::registerKeywords);} \
+ ~classname##RegisterMe(){PLMD::actionRegister().remove(create);} \
} classname##RegisterMeObject;
diff --git a/src/core/ActionSetup.h b/src/core/ActionSetup.h
index 5307d2978..074d2a48a 100644
--- a/src/core/ActionSetup.h
+++ b/src/core/ActionSetup.h
@@ -38,9 +38,9 @@ public:
/// Creator of keywords
static void registerKeywords( Keywords& keys );
/// Do nothing.
- void calculate(){};
+ void calculate(){}
/// Do nothing.
- void apply(){};
+ void apply(){}
};
}
diff --git a/src/core/ActionWithArguments.h b/src/core/ActionWithArguments.h
index 3624e637c..36dfd94f6 100644
--- a/src/core/ActionWithArguments.h
+++ b/src/core/ActionWithArguments.h
@@ -70,7 +70,7 @@ public:
void addForcesOnArguments( const std::vector<double>& forces );
public:
ActionWithArguments(const ActionOptions&);
- virtual ~ActionWithArguments(){};
+ virtual ~ActionWithArguments(){}
/// Calculate the numerical derivatives
/// N.B. only pass an ActionWithValue to this routine if you know exactly what you
/// are doing. The default will be correct for the vast majority of cases
diff --git a/src/core/Atoms.h b/src/core/Atoms.h
index a0aa75d98..b6e36ce0e 100644
--- a/src/core/Atoms.h
+++ b/src/core/Atoms.h
@@ -107,10 +107,10 @@ class Atoms
std::vector<double> positionsToBeReceived;
std::vector<int> indexToBeSent;
std::vector<int> indexToBeReceived;
- operator bool(){return on;};
+ operator bool(){return on;}
DomainDecomposition():
on(false), async(false)
- {};
+ {}
void enable(Communicator& c);
};
@@ -139,7 +139,7 @@ public:
void setNatoms(int);
const int & getNatoms()const;
- void setCollectEnergy(bool b){ collectEnergy=b; };
+ void setCollectEnergy(bool b){ collectEnergy=b; }
void setDomainDecomposition(Communicator&);
void setAtomsGatindex(int*);
@@ -169,16 +169,16 @@ public:
void add(const ActionAtomistic*);
void remove(const ActionAtomistic*);
- double getEnergy()const{plumed_assert(collectEnergy && energyHasBeenSet); return energy;};
+ double getEnergy()const{plumed_assert(collectEnergy && energyHasBeenSet); return energy;}
- bool isEnergyNeeded()const{return collectEnergy;};
+ bool isEnergyNeeded()const{return collectEnergy;}
- void setMDEnergyUnits(double d){MDUnits.setEnergy(d);};
- void setMDLengthUnits(double d){MDUnits.setLength(d);};
- void setMDTimeUnits(double d){MDUnits.setTime(d);};
- const Units& getMDUnits(){return MDUnits;};
- void setUnits(const Units&u){units=u;};
- const Units& getUnits(){return units;};
+ void setMDEnergyUnits(double d){MDUnits.setEnergy(d);}
+ void setMDLengthUnits(double d){MDUnits.setLength(d);}
+ void setMDTimeUnits(double d){MDUnits.setTime(d);}
+ const Units& getMDUnits(){return MDUnits;}
+ void setUnits(const Units&u){units=u;}
+ const Units& getUnits(){return units;}
void updateUnits();
AtomNumber addVirtualAtom(ActionWithVirtualAtom*);
@@ -192,9 +192,9 @@ public:
double getKBoltzmann()const;
double getMDKBoltzmann()const;
bool usingNaturalUnits()const;
- void setNaturalUnits(bool n){naturalUnits=n;};
- void setMDNaturalUnits(bool n){MDnaturalUnits=n;};
- Vector & modifyPosition(AtomNumber i){ return positions[i.index()];};
+ void setNaturalUnits(bool n){naturalUnits=n;}
+ void setMDNaturalUnits(bool n){MDnaturalUnits=n;}
+ Vector & modifyPosition(AtomNumber i){ return positions[i.index()];}
};
inline
diff --git a/src/core/CLTool.h b/src/core/CLTool.h
index 373cfb426..3a1f5291e 100644
--- a/src/core/CLTool.h
+++ b/src/core/CLTool.h
@@ -95,9 +95,9 @@ public:
/// virtual function mapping to the specific main for each tool
virtual int main( FILE* in, FILE*out, Communicator&pc )=0;
/// virtual function returning a one-line descriptor for the tool
- virtual std::string description()const{return "(no description available)";};
+ virtual std::string description()const{return "(no description available)";}
/// virtual destructor to allow inheritance
- virtual ~CLTool(){};
+ virtual ~CLTool(){}
};
template<class T>
diff --git a/src/core/CLToolRegister.h b/src/core/CLToolRegister.h
index 45cb9732d..843028d77 100644
--- a/src/core/CLToolRegister.h
+++ b/src/core/CLToolRegister.h
@@ -92,8 +92,8 @@ std::ostream & operator<<(std::ostream &log,const CLToolRegister&ar);
static class classname##RegisterMe{ \
static PLMD::CLTool* create(const PLMD::CLToolOptions&ao){return new classname(ao);} \
public: \
- classname##RegisterMe(){PLMD::cltoolRegister().add(directive,create,classname::registerKeywords);}; \
- ~classname##RegisterMe(){PLMD::cltoolRegister().remove(create);}; \
+ classname##RegisterMe(){PLMD::cltoolRegister().add(directive,create,classname::registerKeywords);} \
+ ~classname##RegisterMe(){PLMD::cltoolRegister().remove(create);} \
} classname##RegisterMeObject;
diff --git a/src/core/Colvar.h b/src/core/Colvar.h
index 7ad8543ff..d0ec27dde 100644
--- a/src/core/Colvar.h
+++ b/src/core/Colvar.h
@@ -65,9 +65,9 @@ protected:
void setBoxDerivativesNoPbc();
void setBoxDerivativesNoPbc(Value*);
public:
- bool checkIsEnergy(){return isEnergy;};
+ bool checkIsEnergy(){return isEnergy;}
Colvar(const ActionOptions&);
- ~Colvar(){};
+ ~Colvar(){}
static void registerKeywords( Keywords& keys );
};
diff --git a/src/core/MDAtoms.h b/src/core/MDAtoms.h
index dae930e70..e68cd28d5 100644
--- a/src/core/MDAtoms.h
+++ b/src/core/MDAtoms.h
@@ -51,7 +51,7 @@ public:
/// Creates an MDAtomsTyped<T> object such that sizeof(T)==n
static MDAtomsBase* create(unsigned n);
/// Virtual destructor, just to allow inheritance.
- virtual ~MDAtomsBase(){};
+ virtual ~MDAtomsBase(){}
/// Get the size of MD-real
virtual unsigned getRealPrecision()const=0;
/// Set a pointer to the mass array in the MD code
diff --git a/src/core/PlumedMain.h b/src/core/PlumedMain.h
index a1fd25e33..3e71b5322 100644
--- a/src/core/PlumedMain.h
+++ b/src/core/PlumedMain.h
@@ -229,7 +229,7 @@ public:
/// Referenge to the log stream
Log & getLog();
/// Return the number of the step
- long int getStep()const{return step;};
+ long int getStep()const{return step;}
/// Stop the run
void exit(int c=0);
/// Load a shared library
diff --git a/src/core/PlumedMainInitializer.cpp b/src/core/PlumedMainInitializer.cpp
index 41c8a50fd..23399a826 100644
--- a/src/core/PlumedMainInitializer.cpp
+++ b/src/core/PlumedMainInitializer.cpp
@@ -71,7 +71,7 @@ static class PlumedMainInitializer{
PlumedMainInitializer(){
plumed_plumedmain_function_holder fh={plumedmain_create,plumedmain_cmd,plumedmain_finalize};
plumed_kernel_register(&fh);
- };
+ }
} RegisterMe;
}
diff --git a/src/core/TargetDist.h b/src/core/TargetDist.h
index 0fd9bd8fc..0a9674e52 100644
--- a/src/core/TargetDist.h
+++ b/src/core/TargetDist.h
@@ -37,7 +37,7 @@ private:
std::vector<double> target;
Log &log;
public:
- TargetDist(Log& log) : log(log) {};
+ TargetDist(Log& log) : log(log) {}
void read( const PDB& pdb, std::vector<Value*> args );
void read( const std::vector<double>& targ, std::vector<Value*> ar );
double calculate( std::vector<double>& derivs );
diff --git a/src/function/FuncPathMSD.cpp b/src/function/FuncPathMSD.cpp
index bc66d24b1..ee8b1e807 100644
--- a/src/function/FuncPathMSD.cpp
+++ b/src/function/FuncPathMSD.cpp
@@ -75,7 +75,7 @@ typedef vector<double>::const_iterator myiter;
struct ordering {
bool operator ()(pair<unsigned , myiter> const& a, pair<unsigned , myiter> const& b) {
return *(a.second) < *(b.second);
- };
+ }
};
// sorting utility
vector<int> increasingOrder( vector<double> &v){
@@ -84,7 +84,7 @@ vector<int> increasingOrder( vector<double> &v){
unsigned n = 0;
for (myiter it = v.begin(); it != v.end(); ++it, ++n){
order[n] = make_pair(n, it); // note: heere i do not put the values but the addresses that point to the value
- };
+ }
// now sort according the second value
sort(order.begin(), order.end(), ordering());
typedef vector< pair<unsigned , myiter> >::const_iterator pairiter;
@@ -100,7 +100,7 @@ vector<int> increasingOrder( vector<double> &v){
struct pairordering {
bool operator ()(pair<Value * , double> const& a, pair<Value* , double> const& b) {
return (a).second > (b).second;
- };
+ }
};
public:
diff --git a/src/function/Function.h b/src/function/Function.h
index 40b8a52e8..918a33b38 100644
--- a/src/function/Function.h
+++ b/src/function/Function.h
@@ -45,7 +45,7 @@ protected:
void addComponentWithDerivatives( const std::string& name );
public:
Function(const ActionOptions&);
- virtual ~Function(){};
+ virtual ~Function(){}
void apply();
static void registerKeywords(Keywords&);
};
diff --git a/src/generic/Debug.cpp b/src/generic/Debug.cpp
index 59bd2cf41..c1e2b0f1e 100644
--- a/src/generic/Debug.cpp
+++ b/src/generic/Debug.cpp
@@ -57,7 +57,7 @@ public:
Debug(const ActionOptions&ao);
/// Register all the relevant keywords for the action
static void registerKeywords( Keywords& keys );
- void calculate(){};
+ void calculate(){}
void apply();
};
diff --git a/src/generic/DumpAtoms.cpp b/src/generic/DumpAtoms.cpp
index 6dd053a24..e6929f85d 100644
--- a/src/generic/DumpAtoms.cpp
+++ b/src/generic/DumpAtoms.cpp
@@ -98,8 +98,8 @@ public:
DumpAtoms(const ActionOptions&);
~DumpAtoms();
static void registerKeywords( Keywords& keys );
- void calculate(){};
- void apply(){};
+ void calculate(){}
+ void apply(){}
void update();
};
diff --git a/src/generic/DumpDerivatives.cpp b/src/generic/DumpDerivatives.cpp
index 98f92df2c..72e73e8a8 100644
--- a/src/generic/DumpDerivatives.cpp
+++ b/src/generic/DumpDerivatives.cpp
@@ -60,10 +60,10 @@ public ActionWithArguments
string fmt;
OFile of;
public:
- void calculate(){};
+ void calculate(){}
DumpDerivatives(const ActionOptions&);
static void registerKeywords(Keywords& keys);
- void apply(){};
+ void apply(){}
void update();
~DumpDerivatives();
};
@@ -114,7 +114,7 @@ void DumpDerivatives::update(){
for(unsigned i=0;i<getNumberOfArguments();i++){
of.fmtField(fmt);
of.printField(getPntrToArgument(i)->getName(),getPntrToArgument(i)->getDerivative(ipar) );
- };
+ }
of.printField();
}
}
diff --git a/src/generic/DumpForces.cpp b/src/generic/DumpForces.cpp
index 4d7e374c6..696af62d7 100644
--- a/src/generic/DumpForces.cpp
+++ b/src/generic/DumpForces.cpp
@@ -60,10 +60,10 @@ public ActionWithArguments
string file;
OFile of;
public:
- void calculate(){};
+ void calculate(){}
DumpForces(const ActionOptions&);
static void registerKeywords(Keywords& keys);
- void apply(){};
+ void apply(){}
void update();
~DumpForces();
};
@@ -99,7 +99,7 @@ void DumpForces::update(){
of.printField("time",getTime());
for(unsigned i=0;i<getNumberOfArguments();i++){
of.fmtField(" %15.10f").printField(getPntrToArgument(i)->getName(),getPntrToArgument(i)->getForce());
- };
+ }
of.printField();
}
diff --git a/src/generic/DumpProjections.cpp b/src/generic/DumpProjections.cpp
index c0f57b9db..3c3b8968f 100644
--- a/src/generic/DumpProjections.cpp
+++ b/src/generic/DumpProjections.cpp
@@ -44,10 +44,10 @@ public ActionWithArguments
string fmt;
OFile of;
public:
- void calculate(){};
+ void calculate(){}
DumpProjections(const ActionOptions&);
static void registerKeywords(Keywords& keys);
- void apply(){};
+ void apply(){}
void update();
bool checkNeedsGradients()const{return true;}
~DumpProjections();
@@ -89,7 +89,7 @@ void DumpProjections::update(){
of.fmtField(fmt);
of.printField(getPntrToArgument(i)->getName()+"-"+getPntrToArgument(j)->getName(),getProjection(i,j));
}
- };
+ }
of.printField();
}
diff --git a/src/generic/Flush.cpp b/src/generic/Flush.cpp
index c08fc9ebb..1473152b5 100644
--- a/src/generic/Flush.cpp
+++ b/src/generic/Flush.cpp
@@ -65,7 +65,7 @@ public:
checkRead();
}
static void registerKeywords( Keywords& keys );
- void calculate(){};
+ void calculate(){}
void apply(){
plumed.fflush();
log.flush();
diff --git a/src/generic/Group.cpp b/src/generic/Group.cpp
index 764f23efe..b7e17d88b 100644
--- a/src/generic/Group.cpp
+++ b/src/generic/Group.cpp
@@ -72,8 +72,8 @@ public:
Group(const ActionOptions&ao);
~Group();
static void registerKeywords( Keywords& keys );
- void calculate(){};
- void apply(){};
+ void calculate(){}
+ void apply(){}
};
PLUMED_REGISTER_ACTION(Group,"GROUP")
diff --git a/src/generic/Include.cpp b/src/generic/Include.cpp
index 88a75b70f..401168d00 100644
--- a/src/generic/Include.cpp
+++ b/src/generic/Include.cpp
@@ -69,8 +69,8 @@ class Include :
public:
static void registerKeywords( Keywords& keys );
Include(const ActionOptions&ao);
- void calculate(){};
- void apply(){};
+ void calculate(){}
+ void apply(){}
};
PLUMED_REGISTER_ACTION(Include,"INCLUDE")
diff --git a/src/generic/Print.cpp b/src/generic/Print.cpp
index 78c7d5d33..28484a84f 100644
--- a/src/generic/Print.cpp
+++ b/src/generic/Print.cpp
@@ -69,11 +69,11 @@ public ActionWithArguments
vector<Value*> rotateArguments;
/////////////////////////////////////////
public:
- void calculate(){};
+ void calculate(){}
void prepare();
Print(const ActionOptions&);
static void registerKeywords(Keywords& keys);
- void apply(){};
+ void apply(){}
void update();
~Print();
};
@@ -151,7 +151,7 @@ void Print::update(){
ofile.fmtField(fmt);
ofile.printField( getPntrToArgument(i), getArgument(i) );
//ofile.printField(getPntrToArgument(i)->getName(),getArgument(i));
- };
+ }
ofile.printField();
}
diff --git a/src/generic/Read.cpp b/src/generic/Read.cpp
index 509d646aa..3f0243c8b 100644
--- a/src/generic/Read.cpp
+++ b/src/generic/Read.cpp
@@ -54,7 +54,7 @@ public:
Read(const ActionOptions&);
~Read();
void prepare();
- void apply(){};
+ void apply(){}
void calculate();
void update();
std::string getFilename() const;
diff --git a/src/generic/Time.cpp b/src/generic/Time.cpp
index 6cff91ca6..88fd3bed4 100644
--- a/src/generic/Time.cpp
+++ b/src/generic/Time.cpp
@@ -50,7 +50,7 @@ public:
Time(const ActionOptions&);
// active methods:
virtual void calculate();
- virtual void apply(){};
+ virtual void apply(){}
};
PLUMED_REGISTER_ACTION(Time,"TIME")
diff --git a/src/generic/WholeMolecules.cpp b/src/generic/WholeMolecules.cpp
index 79a277b68..ff3f38ded 100644
--- a/src/generic/WholeMolecules.cpp
+++ b/src/generic/WholeMolecules.cpp
@@ -102,7 +102,7 @@ public:
WholeMolecules(const ActionOptions&ao);
static void registerKeywords( Keywords& keys );
void calculate();
- void apply(){};
+ void apply(){}
};
PLUMED_REGISTER_ACTION(WholeMolecules,"WHOLEMOLECULES")
diff --git a/src/multicolvar/ActionVolume.h b/src/multicolvar/ActionVolume.h
index b6285992a..fe7bfa5a9 100644
--- a/src/multicolvar/ActionVolume.h
+++ b/src/multicolvar/ActionVolume.h
@@ -86,7 +86,7 @@ public:
virtual void setupRegion()=0;
virtual bool derivativesOfFractionalCoordinates()=0;
virtual double calculateNumberInside( const Vector& cpos, HistogramBead& bead, Vector& derivatives )=0;
- void apply(){};
+ void apply(){}
};
inline
diff --git a/src/multicolvar/MultiColvar.h b/src/multicolvar/MultiColvar.h
index b42cc9870..702a5dda7 100644
--- a/src/multicolvar/MultiColvar.h
+++ b/src/multicolvar/MultiColvar.h
@@ -62,7 +62,7 @@ protected:
void addCentralAtomDerivatives( const unsigned& iatom, const Tensor& der );
public:
MultiColvar(const ActionOptions&);
- ~MultiColvar(){};
+ ~MultiColvar(){}
static void registerKeywords( Keywords& keys );
/// Resize all the dynamic arrays (used at neighbor list update time and during setup)
void resizeDynamicArrays();
diff --git a/src/multicolvar/MultiColvarBase.h b/src/multicolvar/MultiColvarBase.h
index f84105f7a..6405487e0 100644
--- a/src/multicolvar/MultiColvarBase.h
+++ b/src/multicolvar/MultiColvarBase.h
@@ -94,7 +94,7 @@ protected:
void addCentralAtomDerivatives( const unsigned& iatom, const Tensor& der );
public:
MultiColvarBase(const ActionOptions&);
- ~MultiColvarBase(){};
+ ~MultiColvarBase(){}
static void registerKeywords( Keywords& keys );
/// Prepare for the calculation
void prepare();
diff --git a/src/tools/DRMSD.h b/src/tools/DRMSD.h
index 7fd80a126..2b0b52fbf 100644
--- a/src/tools/DRMSD.h
+++ b/src/tools/DRMSD.h
@@ -39,7 +39,7 @@ class DRMSD {
unsigned natoms;
public:
/// Constructor
- DRMSD(): natoms(0) {};
+ DRMSD(): natoms(0) {}
/// clear the structure
void clear();
/// set reference, align and displace from input pdb structure
diff --git a/src/tools/Exception.h b/src/tools/Exception.h
index f6cfc8298..4194c345c 100644
--- a/src/tools/Exception.h
+++ b/src/tools/Exception.h
@@ -104,7 +104,7 @@ public:
/// Returns the error message
virtual const char* what() const throw(){return msg.c_str();}
/// Destructor should be defined and should not throw other exceptions
- virtual ~Exception() throw(){};
+ virtual ~Exception() throw(){}
};
// With GNU compiler, we can use __PRETTY_FUNCTION__ to get the function name
diff --git a/src/tools/FileBase.h b/src/tools/FileBase.h
index 061d4e5d5..9988d127d 100644
--- a/src/tools/FileBase.h
+++ b/src/tools/FileBase.h
@@ -98,7 +98,7 @@ public:
/// Check for error/eof.
operator bool () const;
/// Set heavyFlush flag
- void setHeavyFlush(){ heavyFlush=true;};
+ void setHeavyFlush(){ heavyFlush=true;}
/// Opens the file (without auto-backup)
FileBase& open(const std::string&name,const std::string& mode);
/// Check if the file exists
diff --git a/src/tools/Grid.h b/src/tools/Grid.h
index f6561f4f4..c6a1ae4b3 100644
--- a/src/tools/Grid.h
+++ b/src/tools/Grid.h
@@ -35,23 +35,23 @@ class WeightBase{
public:
virtual double projectInnerLoop(double &input, double &v)=0;
virtual double projectOuterLoop(double &v)=0;
- virtual ~WeightBase(){};
+ virtual ~WeightBase(){}
};
class BiasWeight:public WeightBase{
public:
double beta,invbeta;
- BiasWeight(double v){beta=v;invbeta=1./beta;};
- double projectInnerLoop(double &input, double &v){return input+exp(beta*v);};
- double projectOuterLoop(double &v){return -invbeta*log(v);};
+ BiasWeight(double v){beta=v;invbeta=1./beta;}
+ double projectInnerLoop(double &input, double &v){return input+exp(beta*v);}
+ double projectOuterLoop(double &v){return -invbeta*log(v);}
};
class ProbWeight:public WeightBase{
public:
double beta,invbeta;
- ProbWeight(double v){beta=v;invbeta=1./beta;};
- double projectInnerLoop(double &input, double &v){return input+v;};
- double projectOuterLoop(double &v){return -invbeta*log(v);};
+ ProbWeight(double v){beta=v;invbeta=1./beta;}
+ double projectInnerLoop(double &input, double &v){return input+v;}
+ double projectOuterLoop(double &v){return -invbeta*log(v);}
};
@@ -180,14 +180,14 @@ public:
/// dump grid on file
virtual void writeToFile(OFile&);
- virtual ~Grid(){};
+ virtual ~Grid(){}
/// project a high dimensional grid onto a low dimensional one: this should be changed at some time
/// to enable many types of weighting
Grid project( const std::vector<std::string> & proj , WeightBase *ptr2obj );
void projectOnLowDimension(double &val , std::vector<int> &varHigh, WeightBase* ptr2obj );
/// set output format
- void setOutputFmt(std::string ss){fmt_=ss;};
+ void setOutputFmt(std::string ss){fmt_=ss;}
};
@@ -206,7 +206,7 @@ class SparseGrid : public Grid
SparseGrid(const std::string& funcl, std::vector<Value*> args, const std::vector<std::string> & gmin,
const std::vector<std::string> & gmax,
const std::vector<unsigned> & nbin, bool dospline, bool usederiv):
- Grid(funcl,args,gmin,gmax,nbin,dospline,usederiv,false){};
+ Grid(funcl,args,gmin,gmax,nbin,dospline,usederiv,false){}
unsigned getSize() const;
unsigned getMaxSize() const;
@@ -236,7 +236,7 @@ class SparseGrid : public Grid
/// dump grid on file
void writeToFile(OFile&);
- virtual ~SparseGrid(){};
+ virtual ~SparseGrid(){}
};
}
diff --git a/src/tools/NeighborList.h b/src/tools/NeighborList.h
index 4b15457a2..bc51feb8e 100644
--- a/src/tools/NeighborList.h
+++ b/src/tools/NeighborList.h
@@ -77,7 +77,7 @@ public:
std::pair<unsigned,unsigned> getClosePair(unsigned i) const;
/// Get the list of neighbors of the i-th atom
std::vector<unsigned> getNeighbors(unsigned i);
- ~NeighborList(){};
+ ~NeighborList(){}
};
}
diff --git a/src/tools/Random.h b/src/tools/Random.h
index 5e3559c01..7000b19e1 100644
--- a/src/tools/Random.h
+++ b/src/tools/Random.h
@@ -55,12 +55,12 @@ public:
void toString(std::string & str)const;
friend std::ostream & operator<<(std::ostream & out,const Random & rng){
rng.WriteStateFull(out); return out;
- };
+ }
friend std::istream & operator>>(std::istream & in,Random & rng){
rng.ReadStateFull(in); return in;
- };
+ }
double Gaussian();
- void IncreasedPrecis(bool i){incPrec=i;};
+ void IncreasedPrecis(bool i){incPrec=i;}
};
}
diff --git a/src/vesselbase/Vessel.h b/src/vesselbase/Vessel.h
index cfc2a1cbd..98323b311 100644
--- a/src/vesselbase/Vessel.h
+++ b/src/vesselbase/Vessel.h
@@ -152,7 +152,7 @@ public:
/// Return a description of the vessel contents
virtual std::string description()=0;
/// Do something before the loop
- virtual void prepare(){};
+ virtual void prepare(){}
/// Calculate the part of the vessel that is done in the loop
virtual bool calculate()=0;
/// Complete the calculation once the loop is finished
diff --git a/src/vesselbase/VesselRegister.h b/src/vesselbase/VesselRegister.h
index 0ee4d99d4..abccc4ca5 100644
--- a/src/vesselbase/VesselRegister.h
+++ b/src/vesselbase/VesselRegister.h
@@ -68,8 +68,8 @@ VesselRegister& vesselRegister();
static class classname##RegisterMe{ \
static PLMD::vesselbase::Vessel * create(const PLMD::vesselbase::VesselOptions&da){return new classname(da);} \
public: \
- classname##RegisterMe(){PLMD::vesselbase::vesselRegister().add(keyword,create,classname::reserveKeyword,classname::registerKeywords);}; \
- ~classname##RegisterMe(){PLMD::vesselbase::vesselRegister().remove(create);}; \
+ classname##RegisterMe(){PLMD::vesselbase::vesselRegister().add(keyword,create,classname::reserveKeyword,classname::registerKeywords);} \
+ ~classname##RegisterMe(){PLMD::vesselbase::vesselRegister().remove(create);} \
} classname##RegisterMeObject;
}
--
GitLab