diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-02-26 17:32:42 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-02-26 17:32:42 +0100 |
| commit | fa17a6da75ca2a987856af06fa2e510730849c54 (patch) | |
| tree | 87a36f4416ec66a7151126edf2a5467e95b27e0d /Eigen | |
| parent | bb94f0ebc642b67d96966cbd31e6e7df03463923 (diff) | |
Fix compilation with ICC that was unable to instanciate first_aligned
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/AssignEvaluator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/AssignEvaluator.h b/Eigen/src/Core/AssignEvaluator.h index 5e134c83a..686512b8c 100644 --- a/Eigen/src/Core/AssignEvaluator.h +++ b/Eigen/src/Core/AssignEvaluator.h @@ -392,7 +392,7 @@ struct copy_using_evaluator_impl<DstXprType, SrcXprType, LinearVectorizedTravers dstAlignment = PacketTraits::AlignedOnScalar ? Aligned : dstIsAligned, srcAlignment = copy_using_evaluator_traits<DstXprType,SrcXprType>::JointAlignment }; - const Index alignedStart = dstIsAligned ? 0 : first_aligned(&dstEvaluator.coeffRef(0), size); + const Index alignedStart = dstIsAligned ? 0 : internal::first_aligned(&dstEvaluator.coeffRef(0), size); const Index alignedEnd = alignedStart + ((size-alignedStart)/packetSize)*packetSize; unaligned_copy_using_evaluator_impl<dstIsAligned!=0>::run(dstEvaluator, srcEvaluator, 0, alignedStart); @@ -560,7 +560,7 @@ struct copy_using_evaluator_impl<DstXprType, SrcXprType, SliceVectorizedTraversa const Index outerSize = dst.outerSize(); const Index alignedStep = alignable ? (packetSize - dst.outerStride() % packetSize) & packetAlignedMask : 0; Index alignedStart = ((!alignable) || copy_using_evaluator_traits<DstXprType,SrcXprType>::DstIsAligned) ? 0 - : first_aligned(&dstEvaluator.coeffRef(0,0), innerSize); + : internal::first_aligned(&dstEvaluator.coeffRef(0,0), innerSize); for(Index outer = 0; outer < outerSize; ++outer) { |