* fixed regression with gcc 4.7
This commit is contained in:
parent
46b3f77d9c
commit
d44a696e21
4 changed files with 6 additions and 4 deletions
|
|
@ -212,7 +212,7 @@ public:
|
||||||
//! Print term values and descriptions
|
//! Print term values and descriptions
|
||||||
void printAll(std::ostream& os) const {
|
void printAll(std::ostream& os) const {
|
||||||
for (size_type i=0; i < size(); ++i )
|
for (size_type i=0; i < size(); ++i )
|
||||||
os << FitnessTraits::getDescription(i) << " = " << operator[](i) << " ";
|
os << FitnessTraits::getDescription(i) << " = " << this->operator[](i) << " ";
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Comparison, using less by default
|
//! Comparison, using less by default
|
||||||
|
|
|
||||||
|
|
@ -94,7 +94,7 @@ public:
|
||||||
|
|
||||||
while (size() > _size)
|
while (size() > _size)
|
||||||
{
|
{
|
||||||
back() = operator[](size()-2);
|
back() = this->operator[](size()-2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -150,7 +150,7 @@ public:
|
||||||
v[i] = node;
|
v[i] = node;
|
||||||
}
|
}
|
||||||
parse_tree<Node> tmp(v.begin(), v.end());
|
parse_tree<Node> tmp(v.begin(), v.end());
|
||||||
swap(tmp);
|
this->swap(tmp);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* old code which caused problems for paradisEO
|
* old code which caused problems for paradisEO
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@ SET (TEST_LIST
|
||||||
t-eoLogger
|
t-eoLogger
|
||||||
t-eoIQRStat
|
t-eoIQRStat
|
||||||
t-eoParallel
|
t-eoParallel
|
||||||
t-openmp
|
#t-openmp # does not work anymore since functions used in this test were removed from EO
|
||||||
#t-eoDualFitness
|
#t-eoDualFitness
|
||||||
t-eoParser
|
t-eoParser
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,8 @@ Caner Candan <caner.candan@thalesgroup.com>
|
||||||
|
|
||||||
#include <omp.h>
|
#include <omp.h>
|
||||||
|
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
#include "real_value.h"
|
#include "real_value.h"
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
|
||||||
Reference in a new issue