Skip to content
Snippets Groups Projects
Commit 091dfa36 authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Merge branch 'devel' into 264-remove-wolf-scalar-and-use-double-instead

# Conflicts:
#	include/core/sensor/sensor_diff_drive.h
#	src/capture/capture_pose.cpp
#	src/feature/feature_diff_drive.cpp
#	src/feature/feature_odom_2D.cpp
#	src/feature/feature_pose.cpp
#	src/sensor/sensor_diff_drive.cpp
#	src/sensor/sensor_odom_2D.cpp
#	src/sensor/sensor_odom_3D.cpp
#	test/gtest_ceres_manager.cpp
#	test/gtest_factor_diff_drive.cpp
#	test/gtest_frame_base.cpp
#	test/gtest_odom_2D.cpp
#	test/gtest_processor_base.cpp
#	test/gtest_processor_diff_drive.cpp
#	test/gtest_processor_motion.cpp
#	test/gtest_processor_tracker_feature_dummy.cpp
#	test/gtest_processor_tracker_landmark_dummy.cpp
#	test/gtest_solver_manager.cpp
parent 1ef293f3
No related branches found
No related tags found
1 merge request!323Resolve "New data structure for storing stateblocks"
Pipeline #4704 passed
This commit is part of merge request !323. Comments created here will be created in the context of that merge request.
......@@ -64,7 +64,7 @@ class HasStateBlocks
// Emplace base state blocks.
template<typename ... Args>
inline std::__1::shared_ptr<StateBlock> emplaceStateBlock(const std::string& _sb_type, Args&&... _args_of_base_state_block_constructor);
inline StateBlockPtr emplaceStateBlock(const std::string& _sb_type, Args&&... _args_of_base_state_block_constructor);
// States
public:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment