From 369dee21ae2e344162199ef6e2c04884b7d5938b Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 22 May 2022 17:55:45 -0700 Subject: [PATCH 1/2] =?UTF-8?q?use=20boost::placeholders::=5F1=20instead?= =?UTF-8?q?=20of=20deprecated=20=5F1,=20and=20use=20default=20C++=20(which?= =?UTF-8?q?=20will=20be=2014=20in=20noetic,=2017=20on=20newer=20systems=20?= =?UTF-8?q?which=20will=20resolve=20log4cxx=200.12=20'error:=20=E2=80=98sh?= =?UTF-8?q?ared=5Fmutex=E2=80=99=20in=20namespace=20=E2=80=98std=E2=80=99?= =?UTF-8?q?=20does=20not=20name=20a=20type')?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hector_geotiff/CMakeLists.txt | 1 - hector_mapping/src/HectorMappingRos.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/hector_geotiff/CMakeLists.txt b/hector_geotiff/CMakeLists.txt index f24e6ae7..3df5e386 100644 --- a/hector_geotiff/CMakeLists.txt +++ b/hector_geotiff/CMakeLists.txt @@ -1,6 +1,5 @@ cmake_minimum_required(VERSION 3.0.2) project(hector_geotiff) -set(CMAKE_CXX_STANDARD 14) find_package(catkin REQUIRED COMPONENTS hector_map_tools hector_nav_msgs nav_msgs pluginlib roscpp std_msgs) diff --git a/hector_mapping/src/HectorMappingRos.cpp b/hector_mapping/src/HectorMappingRos.cpp index 3892ea10..e510b204 100644 --- a/hector_mapping/src/HectorMappingRos.cpp +++ b/hector_mapping/src/HectorMappingRos.cpp @@ -205,7 +205,7 @@ HectorMappingRos::HectorMappingRos() initial_pose_sub_ = new message_filters::Subscriber(node_, "initialpose", 2); initial_pose_filter_ = new tf::MessageFilter(*initial_pose_sub_, tf_, p_map_frame_, 2); - initial_pose_filter_->registerCallback(boost::bind(&HectorMappingRos::initialPoseCallback, this, _1)); + initial_pose_filter_->registerCallback(boost::bind(&HectorMappingRos::initialPoseCallback, this, boost::placeholders::_1)); map__publish_thread_ = new boost::thread(boost::bind(&HectorMappingRos::publishMapLoop, this, p_map_pub_period_)); From e83aae14506b1804b589afcbf6e63ecf504c808b Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 23 Dec 2022 15:41:38 -0800 Subject: [PATCH 2/2] class_loader.h is now class_loader.hpp, class_list_macros.h has an hpp also --- hector_geotiff/src/geotiff_node.cpp | 2 +- hector_geotiff_plugins/src/trajectory_geotiff_plugin.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hector_geotiff/src/geotiff_node.cpp b/hector_geotiff/src/geotiff_node.cpp index aec76236..9e44814e 100644 --- a/hector_geotiff/src/geotiff_node.cpp +++ b/hector_geotiff/src/geotiff_node.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/hector_geotiff_plugins/src/trajectory_geotiff_plugin.cpp b/hector_geotiff_plugins/src/trajectory_geotiff_plugin.cpp index f98d1f81..149f72ef 100644 --- a/hector_geotiff_plugins/src/trajectory_geotiff_plugin.cpp +++ b/hector_geotiff_plugins/src/trajectory_geotiff_plugin.cpp @@ -119,5 +119,5 @@ void TrajectoryMapWriter::draw(MapWriterInterface *interface) } // namespace //register this planner as a MapWriterPluginInterface plugin -#include +#include PLUGINLIB_EXPORT_CLASS(hector_geotiff_plugins::TrajectoryMapWriter, hector_geotiff::MapWriterPluginInterface)