From b7f979b4ddee733ce43a4c7a2c69164fbaa39f0b Mon Sep 17 00:00:00 2001
From: Richard Roberts <richard.jw.roberts@gmail.com>
Date: Fri, 22 Oct 2010 23:18:22 +0000
Subject: [PATCH] Disabled LAPACK version of QR (which didn't work on Linux),
 also added missing header

---
 base/DenseQRUtil.cpp | 2 ++
 base/Matrix.cpp      | 2 +-
 base/Matrix.h        | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/base/DenseQRUtil.cpp b/base/DenseQRUtil.cpp
index 2afeed165..d6634cee3 100644
--- a/base/DenseQRUtil.cpp
+++ b/base/DenseQRUtil.cpp
@@ -23,6 +23,8 @@
 #include <boost/numeric/ublas/matrix_proxy.hpp>
 #include <boost/numeric/ublas/triangular.hpp>
 
+#include <string.h> // for memcpy and memset
+
 using namespace std;
 namespace ublas = boost::numeric::ublas;
 
diff --git a/base/Matrix.cpp b/base/Matrix.cpp
index cf4f14522..aa73336b6 100644
--- a/base/Matrix.cpp
+++ b/base/Matrix.cpp
@@ -669,7 +669,6 @@ void householder(Matrix &A) {
 			A(i,j) = a[k];
 	}
 }
-#endif
 
 void householderColMajor(MatrixColMajor &A) {
   __CLPK_integer m = A.size1();
@@ -686,6 +685,7 @@ void householderColMajor(MatrixColMajor &A) {
   dgeqrf_(&m, &n, A.data().begin(), &m, tau, work, &lwork, &info);
 }
 #endif
+#endif
 
 ///* ************************************************************************* */
 
diff --git a/base/Matrix.h b/base/Matrix.h
index 341c69c36..e9617e785 100644
--- a/base/Matrix.h
+++ b/base/Matrix.h
@@ -271,7 +271,6 @@ void householder(Matrix& A, size_t k);
  * @return nothing: in place !!!
  */
 void householder(Matrix& A);
-#endif
 
 /**
  * Householder tranformation directly on a column-major matrix.  Does not zero
@@ -282,6 +281,7 @@ void householder(Matrix& A);
  */
 void householderColMajor(MatrixColMajor& A);
 #endif
+#endif
 
 /**
  * backSubstitute U*x=b