diff --git a/Eigen/src/Core/Reshape.h b/Eigen/src/Core/Reshape.h index 3e0b91c39..967849185 100644 --- a/Eigen/src/Core/Reshape.h +++ b/Eigen/src/Core/Reshape.h @@ -12,7 +12,7 @@ #ifndef EIGEN_RESHAPE_H #define EIGEN_RESHAPE_H -namespace Eigen { +namespace Eigen { /** \class Reshape * \ingroup Core_Module @@ -89,19 +89,17 @@ struct traits > : traits && ColsAtCompileTime == ReshapeCols && RowsAtCompileTime != Dynamic && ColsAtCompileTime != Dynamic, - MaskDirectAccessBit = (IsSameShapeAtCompileTime ? DirectAccessBit : 0) - && DirectAccessBit, Flags0 = traits::Flags & ( (HereditaryBits & ~RowMajorBit) | - MaskDirectAccessBit | + DirectAccessBit | MaskPacketAccessBit | MaskAlignedBit), - Flags = Flags0 | FlagsLinearAccessBit | FlagsLvalueBit | FlagsRowMajorBit + Flags = (Flags0 | FlagsLinearAccessBit | FlagsLvalueBit | FlagsRowMajorBit) }; }; template::ret> class ReshapeImpl_dense; - + } // end namespace internal template class ReshapeImpl; @@ -138,7 +136,7 @@ template class Reshape eigen_assert(reshapeRows * reshapeCols == xpr.rows() * xpr.cols()); } }; - + // The generic default implementation for dense reshape simplu forward to the internal::ReshapeImpl_dense // that must be specialized for direct and non-direct access... template @@ -287,10 +285,10 @@ template::type& nestedExpression() const - { - return m_xpr; + { + return m_xpr; } - + protected: const typename XprType::Nested m_xpr;