From 900ff799eedc91b5e6d61c73e9882e09d3dff8ee Mon Sep 17 00:00:00 2001 From: Joan Sola <jsola@iri.upc.edu> Date: Thu, 11 Nov 2021 11:39:08 +0100 Subject: [PATCH] Revert "Remove copy constructor" This reverts commit 7be8aee3f90072a5681e066735e08b3895392521. --- include/core/state_block/state_composite.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/core/state_block/state_composite.h b/include/core/state_block/state_composite.h index 0d83c63e5..d0ddf4e7f 100644 --- a/include/core/state_block/state_composite.h +++ b/include/core/state_block/state_composite.h @@ -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_ */ -- GitLab