surpress some warnings

This commit is contained in:
Christoph Hertzberg 2015-08-17 21:50:52 +02:00
parent d2e0927127
commit 8097d8d028
2 changed files with 4 additions and 2 deletions

View File

@ -116,9 +116,12 @@ class PlainObjectBase : public internal::dense_xpr_base<Derived>::type
typedef Eigen::Map<Derived, Unaligned> MapType;
friend class Eigen::Map<const Derived, Unaligned>;
typedef const Eigen::Map<const Derived, Unaligned> ConstMapType;
#if EIGEN_MAX_ALIGN_BYTES>0
// for EIGEN_MAX_ALIGN_BYTES==0, AlignedMax==Unaligned, and many compilers generate warnings for friend-ing a class twice.
friend class Eigen::Map<Derived, AlignedMax>;
typedef Eigen::Map<Derived, AlignedMax> AlignedMapType;
friend class Eigen::Map<const Derived, AlignedMax>;
#endif
typedef Eigen::Map<Derived, AlignedMax> AlignedMapType;
typedef const Eigen::Map<const Derived, AlignedMax> ConstAlignedMapType;
template<typename StrideType> struct StridedMapType { typedef Eigen::Map<Derived, Unaligned, StrideType> type; };
template<typename StrideType> struct StridedConstMapType { typedef Eigen::Map<const Derived, Unaligned, StrideType> type; };

View File

@ -15,7 +15,6 @@
template<typename MatrixType> bool find_pivot(typename MatrixType::Scalar tol, MatrixType &diffs, Index col=0)
{
typedef typename MatrixType::Scalar Scalar;
bool match = diffs.diagonal().sum() <= tol;
if(match || col==diffs.cols())
{