aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Hauke Heibel <hauke.heibel@gmail.com>2009-09-25 10:12:09 +0200
committerGravatar Hauke Heibel <hauke.heibel@gmail.com>2009-09-25 10:12:09 +0200
commit2fbf5ce7df432b3187418e3ac7ae437174346a56 (patch)
tree16921cffd3af00575edb41da56394d1a24110345
parente58e9c842e72222d0f7fd3a60311e6ae1ea0c2cd (diff)
Fixed issue #57.
-rw-r--r--Eigen/src/Core/CommaInitializer.h3
-rw-r--r--Eigen/src/QR/HouseholderQR.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/Eigen/src/Core/CommaInitializer.h b/Eigen/src/Core/CommaInitializer.h
index e86f47ad0..328c5580c 100644
--- a/Eigen/src/Core/CommaInitializer.h
+++ b/Eigen/src/Core/CommaInitializer.h
@@ -116,6 +116,9 @@ struct CommaInitializer
int m_row; // current row id
int m_col; // current col id
int m_currentBlockRows; // current block height
+
+private:
+ CommaInitializer& operator=(const CommaInitializer&);
};
/** \anchor MatrixBaseCommaInitRef
diff --git a/Eigen/src/QR/HouseholderQR.h b/Eigen/src/QR/HouseholderQR.h
index 39edda80c..39502a30f 100644
--- a/Eigen/src/QR/HouseholderQR.h
+++ b/Eigen/src/QR/HouseholderQR.h
@@ -59,7 +59,7 @@ template<typename MatrixType> class HouseholderQR
typedef typename MatrixType::Scalar Scalar;
typedef typename MatrixType::RealScalar RealScalar;
- typedef Matrix<Scalar, RowsAtCompileTime, RowsAtCompileTime> MatrixQType;
+ typedef Matrix<Scalar, RowsAtCompileTime, RowsAtCompileTime, AutoAlign | (ei_traits<MatrixType>::Flags&RowMajorBit ? RowMajor : ColMajor)> MatrixQType;
typedef Matrix<Scalar, DiagSizeAtCompileTime, 1> HCoeffsType;
typedef Matrix<Scalar, 1, ColsAtCompileTime> RowVectorType;
typedef typename HouseholderSequence<MatrixQType,HCoeffsType>::ConjugateReturnType HouseholderSequenceType;