aboutsummaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2012-01-31 09:14:01 +0100
committerGravatar Gael Guennebaud <g.gael@free.fr>2012-01-31 09:14:01 +0100
commit18e3ac0f0d779834fdb1725f29f7ceafff3e102f (patch)
tree603e0000a360d17cdfb27e841f7702796325a538 /test
parent87138075dad1bcef1c496704f2cc3d6983156cbb (diff)
fix some compilation errors with ICC and -strict-ansi
Diffstat (limited to 'test')
-rw-r--r--test/geo_transformations.cpp12
-rw-r--r--test/sparse_basic.cpp8
2 files changed, 10 insertions, 10 deletions
diff --git a/test/geo_transformations.cpp b/test/geo_transformations.cpp
index b606de2fb..3aa70a3af 100644
--- a/test/geo_transformations.cpp
+++ b/test/geo_transformations.cpp
@@ -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());
diff --git a/test/sparse_basic.cpp b/test/sparse_basic.cpp
index 5b22876b0..637c5db51 100644
--- a/test/sparse_basic.cpp
+++ b/test/sparse_basic.cpp
@@ -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());