Skip to content
Snippets Groups Projects

Resolve "Ubuntu 20 not compiling"

Merged Joan Solà Ortega requested to merge 414-ubuntu-20-not-compiling into devel
1 file
+ 7
7
Compare changes
  • Side-by-side
  • Inline
@@ -99,7 +99,7 @@ class MatrixComposite : public std::unordered_map < char, std::unordered_map < c
const std::list<int>& _row_sizes,
const StateStructure& _col_structure,
const std::list<int>& _col_sizes);
// MatrixComposite (const MatrixComposite& m);
MatrixComposite (const MatrixComposite& m);
/**
* \brief Construct from Eigen::VectorXd and structure
*
@@ -358,12 +358,12 @@ inline StateBlockPtr wolf::StateBlockComposite::emplace(const char &_sb_type,
return sb;
}
//inline MatrixComposite::MatrixComposite (const MatrixComposite& m)
// : unordered_map<char, unordered_map<char, MatrixXd> >(m), size_rows_(m.size_rows_), size_cols_(m.size_cols_)
//{
//}
//
//}
inline MatrixComposite::MatrixComposite (const MatrixComposite& m)
: unordered_map<char, unordered_map<char, MatrixXd> >(m), size_rows_(m.size_rows_), size_cols_(m.size_cols_)
{
}
}
#endif /* STATE_BLOCK_STATE_COMPOSITE_H_ */
Loading