From 1d70ba7a9bda4ba4c7d06dc002a4b08002bc897f Mon Sep 17 00:00:00 2001 From: okoenig Date: Thu, 3 Apr 2003 09:11:17 +0000 Subject: [PATCH] Minor changes to make it run under Visual Studio 6.0 --- eo/src/eoScalarFitnessAssembled.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/eo/src/eoScalarFitnessAssembled.h b/eo/src/eoScalarFitnessAssembled.h index 8c278d8b..d1cc19dd 100644 --- a/eo/src/eoScalarFitnessAssembled.h +++ b/eo/src/eoScalarFitnessAssembled.h @@ -107,7 +107,12 @@ public: eoScalarFitnessAssembled( const eoScalarFitnessAssembled& other) : std::vector( other ) {} eoScalarFitnessAssembled& operator=( const eoScalarFitnessAssembled& other) { +#ifdef _MSC_VER + typedef std::vector myvector; + myvector::operator=( other ); +#else std::vector::operator=( other ); +#endif return *this; } @@ -125,7 +130,12 @@ public: //! Overload push_back() void push_back(const ScalarType& _val ){ +#ifdef _MSC_VER + typedef std::vector myvector; + myvector::push_back( _val ); +#else std::vector::push_back( _val ); +#endif if ( size() > FitnessTraits::size() ) FitnessTraits::setDescription( size()-1, "Unnamed variable"); }