mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-03-01 18:26:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix some compilation errors with ICC and -strict-ansi

Browse Source
This commit is contained in:
Gael Guennebaud 2012-01-31 09:14:01 +01:00
parent 87138075da
commit 18e3ac0f0d
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/Core/DenseCoeffsBase.h
View File

@ -719,7 +719,7 @@ struct first_aligned_impl<Derived, false>
{
inline static typename Derived::Index run(const Derived& m)
{
return first_aligned(&m.const_cast_derived().coeffRef(0,0), m.size());
return internal::first_aligned(&m.const_cast_derived().coeffRef(0,0), m.size());
}
};

2
Eigen/src/Core/products/SelfadjointMatrixVector.h
View File

@ -99,7 +99,7 @@ static EIGEN_DONT_INLINE void run(
size_t starti = FirstTriangular ? 0 : j+2;
size_t endi = FirstTriangular ? j : size;
size_t alignedStart = (starti) + first_aligned(&res[starti], endi-starti);
size_t alignedStart = (starti) + internal::first_aligned(&res[starti], endi-starti);
size_t alignedEnd = alignedStart + ((endi-alignedStart)/(PacketSize))*(PacketSize);
// TODO make sure this product is a real * complex and that the rhs is properly conjugated if needed

2
Eigen/src/Eigen2Support/LU.h
View File

@ -57,7 +57,7 @@ class LU : public FullPivLU<MatrixType>
> ImageResultType;
typedef FullPivLU<MatrixType> Base;
LU() : Base() {}
LU() : Base(), m_originalMatrix() {}
template<typename T>
explicit LU(const T& t) : Base(t), m_originalMatrix(t) {}

12
test/geo_transformations.cpp
View File

@ -284,9 +284,9 @@ template<typename Scalar, int Mode, int Options> void transformations()
// mat * aligned scaling and mat * translation
t1 = (Matrix3(q1) * AlignedScaling3(v0)) * Translation3(v0);
VERIFY_IS_APPROX(t0.matrix(), t1.matrix());
t1 = (Matrix3(q1) * Scaling(v0)) * Translation3(v0);
t1 = (Matrix3(q1) * Eigen::Scaling(v0)) * Translation3(v0);
VERIFY_IS_APPROX(t0.matrix(), t1.matrix());
t1 = (q1 * Scaling(v0)) * Translation3(v0);
t1 = (q1 * Eigen::Scaling(v0)) * Translation3(v0);
VERIFY_IS_APPROX(t0.matrix(), t1.matrix());
// mat * transformation and aligned scaling * translation
t1 = Matrix3(q1) * (AlignedScaling3(v0) * Translation3(v0));
@ -295,18 +295,18 @@ template<typename Scalar, int Mode, int Options> void transformations()
t0.setIdentity();
t0.scale(s0).translate(v0);
t1 = Scaling(s0) * Translation3(v0);
t1 = Eigen::Scaling(s0) * Translation3(v0);
VERIFY_IS_APPROX(t0.matrix(), t1.matrix());
t0.prescale(s0);
t1 = Scaling(s0) * t1;
t1 = Eigen::Scaling(s0) * t1;
VERIFY_IS_APPROX(t0.matrix(), t1.matrix());
t0 = t3;
t0.scale(s0);
t1 = t3 * Scaling(s0,s0,s0);
t1 = t3 * Eigen::Scaling(s0,s0,s0);
VERIFY_IS_APPROX(t0.matrix(), t1.matrix());
t0.prescale(s0);
t1 = Scaling(s0,s0,s0) * t1;
t1 = Eigen::Scaling(s0,s0,s0) * t1;
VERIFY_IS_APPROX(t0.matrix(), t1.matrix());

8
test/sparse_basic.cpp
View File

@ -335,11 +335,11 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re
refMat.setZero();
for(int i=0;i<ntriplets;++i)
{
int i = internal::random<int>(0,rows-1);
int j = internal::random<int>(0,cols-1);
int r = internal::random<int>(0,rows-1);
int c = internal::random<int>(0,cols-1);
Scalar v = internal::random<Scalar>();
triplets.push_back(TripletType(i,j,v));
refMat(i,j) += v;
triplets.push_back(TripletType(r,c,v));
refMat(r,c) += v;
}
SparseMatrixType m(rows,cols);
m.setFromTriplets(triplets.begin(), triplets.end());