From 091dfa36166c28ea03d3478349a73d78b1393065 Mon Sep 17 00:00:00 2001
From: Joan Sola <jsola@iri.upc.edu>
Date: Mon, 13 Jan 2020 12:32:23 +0100
Subject: [PATCH] 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
---
include/core/state_block/has_state_blocks.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/core/state_block/has_state_blocks.h b/include/core/state_block/has_state_blocks.h
index a6db5c0b9..7adac4e23 100644
--- a/include/core/state_block/has_state_blocks.h
+++ b/include/core/state_block/has_state_blocks.h
@@ -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:
--
GitLab