Update for gcc-4.3 compatibility
This commit is contained in:
parent
1187a83c82
commit
0388f95758
11 changed files with 152 additions and 130 deletions
|
|
@ -68,7 +68,7 @@ public:
|
|||
eoParticleBestInit <POT> &_initBest,
|
||||
eoTopology <POT> &_topology,
|
||||
eoPop < POT > &_pop
|
||||
) : proc(_proc), procPara(dummyEval), initVelo(_initVelo), initBest(_initBest), topology(_topology), pop(_pop)
|
||||
) : proc(_proc), initVelo(_initVelo), procPara(dummyEval), initBest(_initBest), topology(_topology), pop(_pop)
|
||||
{}
|
||||
|
||||
//! Constructor for parallel evaluation
|
||||
|
|
@ -110,15 +110,15 @@ private :
|
|||
/*
|
||||
@param proc First evaluation
|
||||
@param initVelo Initialization of the velocity
|
||||
@param initBest Initialization of the best
|
||||
*/
|
||||
@param initBest Initialization of the best
|
||||
*/
|
||||
eoUF<POT&, void>& proc;
|
||||
eoVelocityInit < POT > & initVelo;
|
||||
eoParticleBestInit <POT> & initBest;
|
||||
eoPopEvalFunc <POT>& procPara;
|
||||
eoPopEvalFunc <POT>& procPara;
|
||||
eoTopology <POT> & topology;
|
||||
eoPop < POT > & pop;
|
||||
|
||||
|
||||
class eoDummyEval : public eoPopEvalFunc<POT>
|
||||
{
|
||||
public:
|
||||
|
|
|
|||
Reference in a new issue