From 50c370cf973288e28dbbc8815c0c4c38ae86fc31 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Fri, 21 Oct 2011 19:01:26 +0000 Subject: [PATCH] Changed typeof to explicit type to try to avoid mex error --- gtsam/base/blockMatrices.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gtsam/base/blockMatrices.h b/gtsam/base/blockMatrices.h index a95f1a6ba..a1baecd76 100644 --- a/gtsam/base/blockMatrices.h +++ b/gtsam/base/blockMatrices.h @@ -338,6 +338,8 @@ public: typedef MATRIX FullMatrix; typedef Eigen::Block Block; typedef Eigen::Block constBlock; + typedef typename FullMatrix::ColXpr::SegmentReturnType Column; + typedef typename FullMatrix::ConstColXpr::ConstSegmentReturnType constColumn; private: static FullMatrix matrixTemp_; // just for finding types @@ -445,9 +447,6 @@ public: /** access to full matrix */ const FullMatrix& fullMatrix() const { return matrix_; } - typedef typeof((FullMatrix)matrixTemp_.col(0).segment(0, 1)) Column; - typedef typeof(((const FullMatrix&)matrixTemp_).col(0).segment(0, 1)) constColumn; - Column column(size_t i_block, size_t j_block, size_t columnOffset) { assertInvariants(); size_t i_actualBlock = i_block + blockStart_;