diff options
author | Gael Guennebaud <g.gael@free.fr> | 2017-02-11 23:24:06 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2017-02-11 23:24:06 +0100 |
commit | b3750990d551bc55949c0312a68233e99fc7961a (patch) | |
tree | ab8f62352cefffce2e1af2b68be110879e66bfc3 /Eigen | |
parent | c16ee72b2093ae635b1f07ffd95626c3a86dbbfe (diff) |
Workaround some gcc 4.7 warnings
Diffstat (limited to 'Eigen')
-rw-r--r-- | Eigen/src/Core/IndexedView.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Eigen/src/Core/IndexedView.h b/Eigen/src/Core/IndexedView.h index 63878428e..8c57a277c 100644 --- a/Eigen/src/Core/IndexedView.h +++ b/Eigen/src/Core/IndexedView.h @@ -19,8 +19,8 @@ struct traits<IndexedView<XprType, RowIndices, ColIndices> > : traits<XprType> { enum { - RowsAtCompileTime = array_size<RowIndices>::value, - ColsAtCompileTime = array_size<ColIndices>::value, + RowsAtCompileTime = int(array_size<RowIndices>::value), + ColsAtCompileTime = int(array_size<ColIndices>::value), MaxRowsAtCompileTime = RowsAtCompileTime != Dynamic ? int(RowsAtCompileTime) : int(traits<XprType>::MaxRowsAtCompileTime), MaxColsAtCompileTime = ColsAtCompileTime != Dynamic ? int(ColsAtCompileTime) : int(traits<XprType>::MaxColsAtCompileTime), @@ -29,8 +29,8 @@ struct traits<IndexedView<XprType, RowIndices, ColIndices> > : (MaxColsAtCompileTime==1&&MaxRowsAtCompileTime!=1) ? 0 : XprTypeIsRowMajor, - RowIncr = get_compile_time_incr<RowIndices>::value, - ColIncr = get_compile_time_incr<ColIndices>::value, + RowIncr = int(get_compile_time_incr<RowIndices>::value), + ColIncr = int(get_compile_time_incr<ColIndices>::value), InnerIncr = IsRowMajor ? ColIncr : RowIncr, OuterIncr = IsRowMajor ? RowIncr : ColIncr, @@ -51,7 +51,7 @@ struct traits<IndexedView<XprType, RowIndices, ColIndices> > // FIXME we deal with compile-time strides if and only if we have DirectAccessBit flag, // but this is too strict regarding negative strides... - DirectAccessMask = (InnerIncr!=UndefinedIncr && OuterIncr!=UndefinedIncr && InnerIncr>=0 && OuterIncr>=0) ? DirectAccessBit : 0, + DirectAccessMask = (int(InnerIncr)!=UndefinedIncr && int(OuterIncr)!=UndefinedIncr && InnerIncr>=0 && OuterIncr>=0) ? DirectAccessBit : 0, FlagsRowMajorBit = IsRowMajor ? RowMajorBit : 0, FlagsLvalueBit = is_lvalue<XprType>::value ? LvalueBit : 0, Flags = (traits<XprType>::Flags & (HereditaryBits | DirectAccessMask)) | FlagsLvalueBit | FlagsRowMajorBit |