Skip to content
Snippets Groups Projects

Resolve "New data structure for storing stateblocks"

Merged Resolve "New data structure for storing stateblocks"
256-new-data-structure-for-storing-stateblocks into devel
Merged Joan Solà Ortega requested to merge 256-new-data-structure-for-storing-stateblocks into devel
Viewing commit 091dfa36
Prev Next
Show latest version
1 file
+ 1
− 1
Compare changes
  • Side-by-side
  • Inline
  • 091dfa36 
    # 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
include/core/state_block/has_state_blocks.h
+ 1
− 1
@@ -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: