Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
wolf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile_robotics
wolf_projects
wolf_lib
wolf
Commits
900ff799
Commit
900ff799
authored
3 years ago
by
Joan Solà Ortega
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Remove copy constructor"
This reverts commit
7be8aee3
.
parent
0ce3e48d
No related branches found
No related tags found
1 merge request
!425
Resolve "Ubuntu 20 not compiling"
Pipeline
#7118
passed
3 years ago
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/core/state_block/state_composite.h
+7
-7
7 additions, 7 deletions
include/core/state_block/state_composite.h
with
7 additions
and
7 deletions
include/core/state_block/state_composite.h
+
7
−
7
View file @
900ff799
...
@@ -99,7 +99,7 @@ class MatrixComposite : public std::unordered_map < char, std::unordered_map < c
...
@@ -99,7 +99,7 @@ class MatrixComposite : public std::unordered_map < char, std::unordered_map < c
const
std
::
list
<
int
>&
_row_sizes
,
const
std
::
list
<
int
>&
_row_sizes
,
const
StateStructure
&
_col_structure
,
const
StateStructure
&
_col_structure
,
const
std
::
list
<
int
>&
_col_sizes
);
const
std
::
list
<
int
>&
_col_sizes
);
//
MatrixComposite (const MatrixComposite& m);
MatrixComposite
(
const
MatrixComposite
&
m
);
/**
/**
* \brief Construct from Eigen::VectorXd and structure
* \brief Construct from Eigen::VectorXd and structure
*
*
...
@@ -358,12 +358,12 @@ inline StateBlockPtr wolf::StateBlockComposite::emplace(const char &_sb_type,
...
@@ -358,12 +358,12 @@ inline StateBlockPtr wolf::StateBlockComposite::emplace(const char &_sb_type,
return
sb
;
return
sb
;
}
}
//
inline MatrixComposite::MatrixComposite (const MatrixComposite& m)
inline
MatrixComposite
::
MatrixComposite
(
const
MatrixComposite
&
m
)
//
: unordered_map<char, unordered_map<char, MatrixXd> >(m), size_rows_(m.size_rows_), size_cols_(m.size_cols_)
:
unordered_map
<
char
,
unordered_map
<
char
,
MatrixXd
>
>
(
m
),
size_rows_
(
m
.
size_rows_
),
size_cols_
(
m
.
size_cols_
)
//
{
{
//
}
}
//
//
}
}
#endif
/* STATE_BLOCK_STATE_COMPOSITE_H_ */
#endif
/* STATE_BLOCK_STATE_COMPOSITE_H_ */
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment