From bc7aec0ef5475984edc39f43fcb099af44993081 Mon Sep 17 00:00:00 2001 From: Hauke Heibel Date: Mon, 31 Aug 2009 17:24:38 +0200 Subject: [PATCH] ifdef removed from MapBase and warning disabled --- Eigen/src/Core/MapBase.h | 2 -- Eigen/src/Core/util/DisableMSVCWarnings.h | 2 +- 2 files changed, 1 insertion(+), 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 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