From 8684e1fac1ff6434421c8215348ec4416f9504ab Mon Sep 17 00:00:00 2001 From: maartenkeijzer Date: Fri, 27 Oct 2000 09:12:31 +0000 Subject: [PATCH] updated version info, added flush to stdoutmonitor and sprinkled a few typenames in eoPop.h and eoGOpSelector.h (egcs 2.96 started complaining). --- eo/configure.in | 2 +- eo/src/eoGOpSelector.h | 2 +- eo/src/eoPop.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eo/configure.in b/eo/configure.in index 9ad61a7d7..c8be4aba6 100644 --- a/eo/configure.in +++ b/eo/configure.in @@ -1,7 +1,7 @@ AC_INIT(src/eo) dnl Change the version number here -AM_INIT_AUTOMAKE(eo, 0.9.11) +AM_INIT_AUTOMAKE(eo, 0.9.2) AC_PROG_CXX diff --git a/eo/src/eoGOpSelector.h b/eo/src/eoGOpSelector.h index c47cadd20..ae207b9c6 100644 --- a/eo/src/eoGOpSelector.h +++ b/eo/src/eoGOpSelector.h @@ -143,7 +143,7 @@ inline eoOpSelector::ID eoGOpSelector::addOp( eoOp& _op, // Now 'op' is a general operator, either because '_op' was one or // because we wrapped it in an appropriate wrapper in the code above. - iterator result = find(begin(), end(), (eoGeneralOp*) 0); // search for nullpointer + typename eoGOpSelector::iterator result = find(begin(), end(), (eoGeneralOp*) 0); // search for nullpointer if (result == end()) { diff --git a/eo/src/eoPop.h b/eo/src/eoPop.h index d09d940bd..44bea7b82 100644 --- a/eo/src/eoPop.h +++ b/eo/src/eoPop.h @@ -138,7 +138,7 @@ class eoPop: public vector, public eoObject, public eoPersistent */ eoPop::iterator nth_element(int nth) { - iterator it = begin() + nth; + typename eoPop::iterator it = begin() + nth; std::nth_element(begin(), it, end(), greater >()); return it; }