diff options
| author |  Eugene Zhulenev <ezhulenev@google.com> | 2018-08-27 14:34:07 -0700 |
|---|---|---|
| committer | Eugene Zhulenev <ezhulenev@google.com> | 2018-08-27 14:34:07 -0700 |
| commit | c144bb355b74f4600156284e8202fcf9c0c135d8 (patch) | |
| tree | 3e35d145c624b544906a25a447e07104960cd77e /Eigen/src/Core/util/XprHelper.h | |
| parent | 35d90e89600ff2524ec8bdd4ef4b95dd7c78b656 (diff) | |
| parent | 57472886764ff71ad45338c6538649f7a8fa3d0e (diff) | |
Merge with upstream eigen/default
Diffstat (limited to 'Eigen/src/Core/util/XprHelper.h')
| -rw-r--r-- | Eigen/src/Core/util/XprHelper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/Core/util/XprHelper.h b/Eigen/src/Core/util/XprHelper.h index e3231c712..836ff4711 100644 --- a/Eigen/src/Core/util/XprHelper.h +++ b/Eigen/src/Core/util/XprHelper.h @@ -405,7 +405,7 @@ template<typename T> struct plain_matrix_type_row_major typedef Matrix<typename traits<T>::Scalar, Rows, Cols, - (MaxCols==1&&MaxRows!=1) ? RowMajor : ColMajor, + (MaxCols==1&&MaxRows!=1) ? ColMajor : RowMajor, MaxRows, MaxCols > type; |