12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed typeof to explicit type to try to avoid mex error

release/4.3a0
Richard Roberts 2011-10-21 19:01:26 +00:00
parent 905377efb6
commit 50c370cf97
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtsam/base/blockMatrices.h
View File

@ -338,6 +338,8 @@ public:
typedef MATRIX FullMatrix; typedef MATRIX FullMatrix;
typedef Eigen::Block<MATRIX> Block; typedef Eigen::Block<MATRIX> Block;
typedef Eigen::Block<const MATRIX> constBlock; typedef Eigen::Block<const MATRIX> constBlock;
typedef typename FullMatrix::ColXpr::SegmentReturnType Column;
typedef typename FullMatrix::ConstColXpr::ConstSegmentReturnType constColumn;
private: private:
static FullMatrix matrixTemp_; // just for finding types static FullMatrix matrixTemp_; // just for finding types
@ -445,9 +447,6 @@ public:
/** access to full matrix */ /** access to full matrix */
const FullMatrix& fullMatrix() const { return 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) { Column column(size_t i_block, size_t j_block, size_t columnOffset) {
assertInvariants(); assertInvariants();
size_t i_actualBlock = i_block + blockStart_; size_t i_actualBlock = i_block + blockStart_;