GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-13 20:26:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Gael Guennebaud 2010-07-22 17:23:11 +02:00
parent 5d98fa235d
commit 9daa66f262
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Eigen/src/Core/SelfCwiseBinaryOp.h
View File

@ -44,7 +44,9 @@ struct ei_traits<SelfCwiseBinaryOp<BinaryOp,Lhs,Rhs> >
: ei_traits<CwiseBinaryOp<BinaryOp,Lhs,Rhs> > : ei_traits<CwiseBinaryOp<BinaryOp,Lhs,Rhs> >
{ {
enum { enum {
Flags = ei_traits<CwiseBinaryOp<BinaryOp,Lhs,Rhs> >::Flags | (Lhs::Flags&DirectAccessBit), // Note that it is still a good idea to preserve the DirectAccessBit
// so that assign can correctly align the data.
Flags = ei_traits<CwiseBinaryOp<BinaryOp,Lhs,Rhs> >::Flags | (Lhs::Flags&DirectAccessBit) | (Lhs::Flags&LvalueBit),
OuterStrideAtCompileTime = Lhs::OuterStrideAtCompileTime, OuterStrideAtCompileTime = Lhs::OuterStrideAtCompileTime,
InnerStrideAtCompileTime = Lhs::InnerStrideAtCompileTime InnerStrideAtCompileTime = Lhs::InnerStrideAtCompileTime
}; };

10
Eigen/src/Geometry/arch/Geometry_SSE.h
View File

@ -2,7 +2,7 @@
// for linear algebra. // for linear algebra.
// //
// Copyright (C) 2009 Rohit Garg <rpg.314@gmail.com> // Copyright (C) 2009 Rohit Garg <rpg.314@gmail.com>
// Copyright (C) 2009 Gael Guennebaud <gael.guennebaud@inria.fr> // Copyright (C) 2009-2010 Gael Guennebaud <gael.guennebaud@inria.fr>
// //
// Eigen is free software; you can redistribute it and/or // Eigen is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -79,10 +79,10 @@ struct ei_quat_product<Architecture::SSE, Derived, OtherDerived, double, Aligned
const double* a = _a.coeffs().data(); const double* a = _a.coeffs().data();
Packet2d b_xy = _b.coeffs().template packet<Aligned>(0); Packet2d b_xy = _b.coeffs().template packet<Aligned>(0);
Packet2d b_zw = _b.coeffs().template packet<Aligned>(2); Packet2d b_zw = _b.coeffs().template packet<Aligned>(2);
Packet2d a_xx = ei_pset1(a[0]); Packet2d a_xx = ei_pset1<Packet2d>(a[0]);
Packet2d a_yy = ei_pset1(a[1]); Packet2d a_yy = ei_pset1<Packet2d>(a[1]);
Packet2d a_zz = ei_pset1(a[2]); Packet2d a_zz = ei_pset1<Packet2d>(a[2]);
Packet2d a_ww = ei_pset1(a[3]); Packet2d a_ww = ei_pset1<Packet2d>(a[3]);
// two temporaries: // two temporaries:
Packet2d t1, t2; Packet2d t1, t2;