GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix a few compilation errors and warnings (ICC)

Browse Source
This commit is contained in:
Gael Guennebaud 2009-03-11 08:45:53 +00:00
parent 14691d6836
commit f697ea6d30
5 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Eigen/src/Array/PartialRedux.h
View File

@ -281,17 +281,17 @@ template<typename ExpressionType, int Direction> class PartialRedux
return Reverse<ExpressionType, Direction>( _expression() ); return Reverse<ExpressionType, Direction>( _expression() );
} }
const Replicate<ExpressionType,Direction==Vertical?Dynamic:1,Direction==Horizontal?Dynamic:1>
replicate(int factor) const;
template<int Factor> template<int Factor>
const Replicate<ExpressionType,Direction==Vertical?Factor:1,Direction==Horizontal?Factor:1> const Replicate<ExpressionType,(Direction==Vertical?Factor:1),(Direction==Horizontal?Factor:1)>
replicate(int factor = Factor) const; replicate(int factor = Factor) const;
/////////// Geometry module /////////// /////////// Geometry module ///////////
const Homogeneous<ExpressionType,Direction> homogeneous() const; const Homogeneous<ExpressionType,Direction> homogeneous() const;
const Replicate<ExpressionType,Direction==Vertical?Dynamic:1,Direction==Horizontal?Dynamic:1>
replicate(int factor) const;
typedef typename ExpressionType::PlainMatrixType CrossReturnType; typedef typename ExpressionType::PlainMatrixType CrossReturnType;
template<typename OtherDerived> template<typename OtherDerived>
const CrossReturnType cross(const MatrixBase<OtherDerived>& other) const; const CrossReturnType cross(const MatrixBase<OtherDerived>& other) const;

2
Eigen/src/Array/Replicate.h
View File

@ -70,7 +70,7 @@ template<typename MatrixType,int RowFactor,int ColFactor> class Replicate
EIGEN_GENERIC_PUBLIC_INTERFACE(Replicate) EIGEN_GENERIC_PUBLIC_INTERFACE(Replicate)
inline Replicate(const MatrixType& matrix) inline Replicate(const MatrixType& matrix)
: m_matrix(matrix) : m_matrix(matrix), m_rowFactor(RowFactor), m_colFactor(ColFactor)
{ {
ei_assert(RowFactor!=Dynamic && ColFactor!=Dynamic); ei_assert(RowFactor!=Dynamic && ColFactor!=Dynamic);
} }

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

@ -33,8 +33,8 @@ template<typename Lhs, typename Rhs,
? LowerTriangular ? LowerTriangular
: (int(Lhs::Flags) & UpperTriangularBit) : (int(Lhs::Flags) & UpperTriangularBit)
? UpperTriangular ? UpperTriangular
: -1, : 0xffffff,
int StorageOrder = ei_is_part<Lhs>::value ? -1 // this is to solve ambiguous specializations int StorageOrder = ei_is_part<Lhs>::value ? 0xffffff // this is to solve ambiguous specializations
: int(Lhs::Flags) & (RowMajorBit|SparseBit) : int(Lhs::Flags) & (RowMajorBit|SparseBit)
> >
struct ei_solve_triangular_selector; struct ei_solve_triangular_selector;

4
Eigen/src/Core/products/GeneralMatrixMatrix.h
View File

@ -176,7 +176,7 @@ static void ei_cache_friendly_product(
{ {
const Scalar* blA = &blockA[i*actual_kc]; const Scalar* blA = &blockA[i*actual_kc];
#ifdef EIGEN_VECTORIZE_SSE #ifdef EIGEN_VECTORIZE_SSE
_mm_prefetch(&blA[0], _MM_HINT_T0); _mm_prefetch((const char*)(&blA[0]), _MM_HINT_T0);
#endif #endif
// TODO move the res loads to the stores // TODO move the res loads to the stores
@ -299,7 +299,7 @@ static void ei_cache_friendly_product(
{ {
const Scalar* blA = &blockA[i*actual_kc]; const Scalar* blA = &blockA[i*actual_kc];
#ifdef EIGEN_VECTORIZE_SSE #ifdef EIGEN_VECTORIZE_SSE
_mm_prefetch(&blA[0], _MM_HINT_T0); _mm_prefetch((const char*)(&blA[0]), _MM_HINT_T0);
#endif #endif
// gets a 1 x nr res block as registers // gets a 1 x nr res block as registers

2
Eigen/src/Geometry/Transform.h
View File

@ -386,7 +386,7 @@ public:
Transform& fromPositionOrientationScale(const MatrixBase<PositionDerived> &position, Transform& fromPositionOrientationScale(const MatrixBase<PositionDerived> &position,
const OrientationType& orientation, const MatrixBase<ScaleDerived> &scale); const OrientationType& orientation, const MatrixBase<ScaleDerived> &scale);
inline const MatrixType inverse(TransformTraits traits = Mode) const; inline const MatrixType inverse(TransformTraits traits = (TransformTraits)Mode) const;
/** \returns a const pointer to the column major internal matrix */ /** \returns a const pointer to the column major internal matrix */
const Scalar* data() const { return m_matrix.data(); } const Scalar* data() const { return m_matrix.data(); }