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

Fix issue regarding windows compilation of generic values specialization of eigen matrix

release/4.3a0
Andrew Melim 2014-11-12 14:34:27 -05:00
parent 02524f42e7
commit 77bc615424
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtsam/base/GenericValue.h
View File

@ -70,9 +70,9 @@ struct print<double> {
}; };
// equals for Matrix types // equals for Matrix types
template<int M, int N, int Options> template<int _Rows, int _Cols, int _Options, int _MaxRows, int _MaxCols>
struct equals<Eigen::Matrix<double, M, N, Options> > { struct equals<Eigen::Matrix<double, _Rows, _Cols, _Options, _MaxRows, _MaxCols> > {
typedef Eigen::Matrix<double, M, N, Options> type; typedef Eigen::Matrix<double, _Rows, _Cols, _Options, _MaxRows, _MaxCols> type;
typedef bool result_type; typedef bool result_type;
bool operator()(const type& A, const type& B, double tol) { bool operator()(const type& A, const type& B, double tol) {
return equal_with_abs_tol(A, B, tol); return equal_with_abs_tol(A, B, tol);
@ -80,9 +80,9 @@ struct equals<Eigen::Matrix<double, M, N, Options> > {
}; };
// print for Matrix types // print for Matrix types
template<int M, int N, int Options> template<int _Rows, int _Cols, int _Options, int _MaxRows, int _MaxCols>
struct print<Eigen::Matrix<double, M, N, Options> > { struct print<Eigen::Matrix<double, _Rows, _Cols, _Options, _MaxRows, _MaxCols> > {
typedef Eigen::Matrix<double, M, N, Options> type; typedef Eigen::Matrix<double, _Rows, _Cols, _Options, _MaxRows, _MaxCols> type;
typedef void result_type; typedef void result_type;
void operator()(const type& A, const std::string& str) { void operator()(const type& A, const std::string& str) {
std::cout << str << ": " << A << std::endl; std::cout << str << ": " << A << std::endl;