updated version info, added flush to stdoutmonitor and sprinkled a few typenames
in eoPop.h and eoGOpSelector.h (egcs 2.96 started complaining).
This commit is contained in:
parent
5e31ae1338
commit
8684e1fac1
3 changed files with 3 additions and 3 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
AC_INIT(src/eo)
|
AC_INIT(src/eo)
|
||||||
|
|
||||||
dnl Change the version number here
|
dnl Change the version number here
|
||||||
AM_INIT_AUTOMAKE(eo, 0.9.11)
|
AM_INIT_AUTOMAKE(eo, 0.9.2)
|
||||||
|
|
||||||
AC_PROG_CXX
|
AC_PROG_CXX
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -143,7 +143,7 @@ inline eoOpSelector<EOT>::ID eoGOpSelector<EOT>::addOp( eoOp<EOT>& _op,
|
||||||
// Now 'op' is a general operator, either because '_op' was one or
|
// Now 'op' is a general operator, either because '_op' was one or
|
||||||
// because we wrapped it in an appropriate wrapper in the code above.
|
// because we wrapped it in an appropriate wrapper in the code above.
|
||||||
|
|
||||||
iterator result = find(begin(), end(), (eoGeneralOp<EOT>*) 0); // search for nullpointer
|
typename eoGOpSelector<EOT>::iterator result = find(begin(), end(), (eoGeneralOp<EOT>*) 0); // search for nullpointer
|
||||||
|
|
||||||
if (result == end())
|
if (result == end())
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -138,7 +138,7 @@ class eoPop: public vector<EOT>, public eoObject, public eoPersistent
|
||||||
*/
|
*/
|
||||||
eoPop<EOT>::iterator nth_element(int nth)
|
eoPop<EOT>::iterator nth_element(int nth)
|
||||||
{
|
{
|
||||||
iterator it = begin() + nth;
|
typename eoPop<EOT>::iterator it = begin() + nth;
|
||||||
std::nth_element(begin(), it, end(), greater<EO<Fitness> >());
|
std::nth_element(begin(), it, end(), greater<EO<Fitness> >());
|
||||||
return it;
|
return it;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Reference in a new issue