nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor changes to make it run under Visual Studio 6.0

Browse source
This commit is contained in:
okoenig 2003-04-03 09:11:17 +00:00
commit 1d70ba7a9b
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
eo/src/eoScalarFitnessAssembled.h
View file

@ -107,7 +107,12 @@ public:
eoScalarFitnessAssembled( const eoScalarFitnessAssembled& other) : std::vector<ScalarType>( other ) {} eoScalarFitnessAssembled( const eoScalarFitnessAssembled& other) : std::vector<ScalarType>( other ) {}
eoScalarFitnessAssembled& operator=( const eoScalarFitnessAssembled& other) { eoScalarFitnessAssembled& operator=( const eoScalarFitnessAssembled& other) {
#ifdef _MSC_VER
typedef std::vector<ScalarType> myvector;
myvector::operator=( other );
#else
std::vector<ScalarType>::operator=( other ); std::vector<ScalarType>::operator=( other );
#endif
return *this; return *this;
} }
@ -125,7 +130,12 @@ public:
//! Overload push_back() //! Overload push_back()
void push_back(const ScalarType& _val ){ void push_back(const ScalarType& _val ){
#ifdef _MSC_VER
typedef std::vector<ScalarType> myvector;
myvector::push_back( _val );
#else
std::vector<ScalarType>::push_back( _val ); std::vector<ScalarType>::push_back( _val );
#endif
if ( size() > FitnessTraits::size() ) if ( size() > FitnessTraits::size() )
FitnessTraits::setDescription( size()-1, "Unnamed variable"); FitnessTraits::setDescription( size()-1, "Unnamed variable");
} }