aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/products/GeneralBlockPanelKernel.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 /Eigen/src/Core/products/GeneralBlockPanelKernel.h
parent6466fa63be51b32c493401bb7cf6aa4b2e1ef385 (diff)
Re-enbale detection of min/max parentheses protection, and re-enable mpreal_support unit test.
Diffstat (limited to 'Eigen/src/Core/products/GeneralBlockPanelKernel.h')
-rw-r--r--Eigen/src/Core/products/GeneralBlockPanelKernel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 9061fd936..1f57b6de0 100644
--- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h
+++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
@@ -164,7 +164,7 @@ void computeProductBlockingSizes(Index& k, Index& m, Index& n, Index num_threads
// Perhaps it would make more sense to consider k*n*m??
// Note that for very tiny problem, this function should be bypassed anyway
// because we use the coefficient-based implementation for them.
- if(std::max(k,std::max(m,n))<48)
+ if((std::max)(k,(std::max)(m,n))<48)
return;
typedef typename Traits::ResScalar ResScalar;