diff options
| author |  Jitse Niesen <jitse@maths.leeds.ac.uk> | 2011-04-12 13:35:08 +0100 |
|---|---|---|
| committer | Jitse Niesen <jitse@maths.leeds.ac.uk> | 2011-04-12 13:35:08 +0100 |
| commit | 88b3116b9932ac8fecb5f72bf590e2b44fc9d0ff (patch) | |
| tree | 8e5d45f5281f2cb64e29be9bf9424a78428604d4 /Eigen | |
| parent | 0c146bee1b5981eb99a747e3176daea6c0a287ff (diff) | |
Decouple AssignEvaluator.h from assign_traits from Assign.h
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/AssignEvaluator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/AssignEvaluator.h b/Eigen/src/Core/AssignEvaluator.h index cf0ab5fda..886b0aeba 100644 --- a/Eigen/src/Core/AssignEvaluator.h +++ b/Eigen/src/Core/AssignEvaluator.h @@ -309,14 +309,14 @@ struct copy_using_evaluator_impl<DstXprType, SrcXprType, SliceVectorizedTraversa enum { packetSize = PacketTraits::size, alignable = PacketTraits::AlignedOnScalar, - dstAlignment = alignable ? Aligned : int(assign_traits<DstXprType,SrcXprType>::DstIsAligned) , - srcAlignment = assign_traits<DstXprType,SrcXprType>::JointAlignment + dstAlignment = alignable ? Aligned : int(copy_using_evaluator_traits<DstXprType,SrcXprType>::DstIsAligned) , + srcAlignment = copy_using_evaluator_traits<DstXprType,SrcXprType>::JointAlignment }; const Index packetAlignedMask = packetSize - 1; const Index innerSize = dst.innerSize(); const Index outerSize = dst.outerSize(); const Index alignedStep = alignable ? (packetSize - dst.outerStride() % packetSize) & packetAlignedMask : 0; - Index alignedStart = ((!alignable) || assign_traits<DstXprType,SrcXprType>::DstIsAligned) ? 0 + Index alignedStart = ((!alignable) || copy_using_evaluator_traits<DstXprType,SrcXprType>::DstIsAligned) ? 0 : first_aligned(&dstEvaluator.coeffRef(0,0), innerSize); for(Index outer = 0; outer < outerSize; ++outer) |