aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/main.h
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2015-02-27 22:38:00 +0100
committerGravatar Gael Guennebaud <g.gael@free.fr>2015-02-27 22:38:00 +0100
commitb10cd3afd2ba85d0e8bca68bf0e716391e185837 (patch)
treedfcb4f7954d32de7861ad5bea893c69230facc14 /test/main.h
parent6466fa63be51b32c493401bb7cf6aa4b2e1ef385 (diff)
Re-enbale detection of min/max parentheses protection, and re-enable mpreal_support unit test.
Diffstat (limited to 'test/main.h')
-rw-r--r--test/main.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/test/main.h b/test/main.h
index 1f937690c..ecf0c6924 100644
--- a/test/main.h
+++ b/test/main.h
@@ -42,13 +42,19 @@
#include <deque>
#include <queue>
#include <list>
+#if __cplusplus >= 201103L
+#include <random>
+#ifdef EIGEN_USE_THREADS
+#include <future>
+#endif
+#endif
// To test that all calls from Eigen code to std::min() and std::max() are
// protected by parenthesis against macro expansion, the min()/max() macros
// are defined here and any not-parenthesized min/max call will cause a
// compiler error.
-//#define min(A,B) please_protect_your_min_with_parentheses
-//#define max(A,B) please_protect_your_max_with_parentheses
+#define min(A,B) please_protect_your_min_with_parentheses
+#define max(A,B) please_protect_your_max_with_parentheses
#define FORBIDDEN_IDENTIFIER (this_identifier_is_forbidden_to_avoid_clashes) this_identifier_is_forbidden_to_avoid_clashes
// B0 is defined in POSIX header termios.h