aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/AssignEvaluator.h
diff options
context:
space:
mode:
authorGravatar Robert Lukierski <robert@lukierski.eu>2016-10-12 18:59:05 +0100
committerGravatar Robert Lukierski <robert@lukierski.eu>2016-10-12 18:59:05 +0100
commit471075f7ad8e78d4d3e400bc1124e39102515aec (patch)
tree2c040cbd298ffd8be0598a73be613fe3e0848509 /Eigen/src/Core/AssignEvaluator.h
parent86711497c4584534793b186fb0c72f8002a9fe86 (diff)
Fixes min() warnings.
Diffstat (limited to 'Eigen/src/Core/AssignEvaluator.h')
-rw-r--r--Eigen/src/Core/AssignEvaluator.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/Core/AssignEvaluator.h b/Eigen/src/Core/AssignEvaluator.h
index 30b36be11..844b85ab3 100644
--- a/Eigen/src/Core/AssignEvaluator.h
+++ b/Eigen/src/Core/AssignEvaluator.h
@@ -555,7 +555,7 @@ struct dense_assignment_loop<Kernel, SliceVectorizedTraversal, NoUnrolling>
for(Index inner = alignedEnd; inner<innerSize ; ++inner)
kernel.assignCoeffByOuterInner(outer, inner);
- alignedStart = min((Index)(alignedStart+alignedStep)%packetSize, (Index)innerSize);
+ alignedStart = (min)((Index)(alignedStart+alignedStep)%packetSize, (Index)innerSize);
}
}
};