Skip to content

Commit 66fe138

Browse files
committed
one manual patch from upstream Eigen that has not been ported to 3.3.x
1 parent bcaa34a commit 66fe138

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

inst/include/Eigen/src/Core/util/DisableStupidWarnings.h

100755100644
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#ifdef _MSC_VER
55
// 4100 - unreferenced formal parameter (occurred e.g. in aligned_allocator::destroy(pointer p))
66
// 4101 - unreferenced local variable
7-
// 4127 - conditional expression is constant
87
// 4181 - qualifier applied to reference type ignored
98
// 4211 - nonstandard extension used : redefined extern to static
109
// 4244 - 'argument' : conversion from 'type1' to 'type2', possible loss of data
@@ -20,7 +19,7 @@
2019
#ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS
2120
#pragma warning( push )
2221
#endif
23-
#pragma warning( disable : 4100 4101 4127 4181 4211 4244 4273 4324 4503 4512 4522 4700 4714 4717 4800)
22+
#pragma warning( disable : 4100 4101 4181 4211 4244 4273 4324 4503 4512 4522 4700 4714 4717 4800)
2423

2524
#elif defined __INTEL_COMPILER
2625
// 2196 - routine is both "inline" and "noinline" ("noinline" assumed)
@@ -42,6 +41,9 @@
4241
#pragma clang diagnostic push
4342
#endif
4443
#pragma clang diagnostic ignored "-Wconstant-logical-operand"
44+
#if __clang_major__ >= 3 && __clang_minor__ >= 5
45+
#pragma clang diagnostic ignored "-Wabsolute-value"
46+
#endif
4547

4648
#elif defined __GNUC__ && __GNUC__>=6
4749

@@ -53,6 +55,7 @@
5355
#endif
5456

5557
#if defined __NVCC__
58+
#pragma diag_suppress boolean_controlling_expr_is_constant
5659
// Disable the "statement is unreachable" message
5760
#pragma diag_suppress code_is_unreachable
5861
// Disable the "dynamic initialization in unreachable code" message
@@ -70,6 +73,7 @@
7073
#pragma diag_suppress 2671
7174
#pragma diag_suppress 2735
7275
#pragma diag_suppress 2737
76+
#pragma diag_suppress 2739
7377
#endif
7478

7579
#endif // not EIGEN_WARNINGS_DISABLED

0 commit comments

Comments
 (0)