ifdef removed from MapBase and warning disabled

This commit is contained in:
Hauke Heibel 2009-08-31 17:24:38 +02:00
parent 095809edda
commit bc7aec0ef5
2 changed files with 1 additions and 3 deletions

View File

@ -180,12 +180,10 @@ template<typename Derived> class MapBase
&& cols >= 0 && (ColsAtCompileTime == Dynamic || ColsAtCompileTime == cols))); && cols >= 0 && (ColsAtCompileTime == Dynamic || ColsAtCompileTime == cols)));
} }
#ifndef _MSC_VER
Derived& operator=(const MapBase& other) Derived& operator=(const MapBase& other)
{ {
return Base::operator=(other); return Base::operator=(other);
} }
#endif
using Base::operator=; using Base::operator=;
using Base::operator*=; using Base::operator*=;

View File

@ -1,5 +1,5 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4181 4244 4127 4211 4717 ) #pragma warning( disable : 4181 4244 4127 4211 4522 4717 )
#endif #endif