diff options
| author |  Hauke Heibel <hauke.heibel@gmail.com> | 2009-08-31 17:24:38 +0200 |
|---|---|---|
| committer | Hauke Heibel <hauke.heibel@gmail.com> | 2009-08-31 17:24:38 +0200 |
| commit | bc7aec0ef5475984edc39f43fcb099af44993081 (patch) | |
| tree | e43ee7d17cd770d3a22df0076274c6243dd6577d /Eigen/src | |
| parent | 095809edda92cb149cf3f558f2263a8dd3881da8 (diff) | |
ifdef removed from MapBase and warning disabled
Diffstat (limited to 'Eigen/src')
| -rw-r--r-- | Eigen/src/Core/MapBase.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Core/util/DisableMSVCWarnings.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Eigen/src/Core/MapBase.h b/Eigen/src/Core/MapBase.h index 404fa176e..88a3fac1e 100644 --- a/Eigen/src/Core/MapBase.h +++ b/Eigen/src/Core/MapBase.h @@ -180,12 +180,10 @@ template<typename Derived> class MapBase && cols >= 0 && (ColsAtCompileTime == Dynamic || ColsAtCompileTime == cols))); } -#ifndef _MSC_VER Derived& operator=(const MapBase& other) { return Base::operator=(other); } -#endif using Base::operator=; using Base::operator*=; diff --git a/Eigen/src/Core/util/DisableMSVCWarnings.h b/Eigen/src/Core/util/DisableMSVCWarnings.h index 765ddecc5..ca8e245b3 100644 --- a/Eigen/src/Core/util/DisableMSVCWarnings.h +++ b/Eigen/src/Core/util/DisableMSVCWarnings.h @@ -1,5 +1,5 @@ #ifdef _MSC_VER #pragma warning( push ) - #pragma warning( disable : 4181 4244 4127 4211 4717 ) + #pragma warning( disable : 4181 4244 4127 4211 4522 4717 ) #endif |