diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-12-11 10:55:07 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-12-11 10:55:07 +0100 |
| commit | 79c1e6d0a63883cec691eaebcdbf0935ad557f70 (patch) | |
| tree | adbe9cdb88df674158c9f9d4e70ecc02cd13b21e /Eigen/src/Core/util/DisableStupidWarnings.h | |
| parent | 7ad1aaec1db2dbf1abfc19a5bb62626653fa48fb (diff) | |
Fix compilation of MKL support.
Diffstat (limited to 'Eigen/src/Core/util/DisableStupidWarnings.h')
| -rwxr-xr-x[-rw-r--r--] | Eigen/src/Core/util/DisableStupidWarnings.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Eigen/src/Core/util/DisableStupidWarnings.h b/Eigen/src/Core/util/DisableStupidWarnings.h index 46c141ad5..747232938 100644..100755 --- a/Eigen/src/Core/util/DisableStupidWarnings.h +++ b/Eigen/src/Core/util/DisableStupidWarnings.h @@ -25,10 +25,12 @@ // typedef that may be a reference type. // 279 - controlling expression is constant // ICC 12 generates this warning on assert(constant_expression_depending_on_template_params) and frankly this is a legitimate use case. + // 1684 - conversion from pointer to same-sized integral type (potential portability problem) + // 2259 - non-pointer conversion from "Eigen::Index={ptrdiff_t={long}}" to "int" may lose significant bits #ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS #pragma warning push #endif - #pragma warning disable 2196 279 + #pragma warning disable 2196 279 1684 2259 #elif defined __clang__ // -Wconstant-logical-operand - warning: use of logical && with constant operand; switch to bitwise & or remove constant // this is really a stupid warning as it warns on compile-time expressions involving enums |