Skip to content

Commit 4d3fc09

Browse files
authored
Merge pull request #105 from locusrobotics/noetic_eol_devel
Noetic EOL Changes
2 parents 2350d4d + f729a0f commit 4d3fc09

File tree

38 files changed

+110
-56
lines changed

38 files changed

+110
-56
lines changed

costmap_queue/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.10.2)
22
project(costmap_queue)
33

4-
set_directory_properties(PROPERTIES COMPILE_OPTIONS "-std=c++11;-Wall;-Werror")
4+
set_directory_properties(PROPERTIES COMPILE_OPTIONS "-Wall;-Werror")
5+
if(NOT "${CMAKE_CXX_STANDARD}")
6+
set(CMAKE_CXX_STANDARD 14)
7+
endif()
58

69
find_package(catkin REQUIRED COMPONENTS
710
nav_core2

dlux_global_planner/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.10.2)
22
project(dlux_global_planner)
3-
set_directory_properties(PROPERTIES COMPILE_OPTIONS "-std=c++11;-Wall;-Werror")
3+
set_directory_properties(PROPERTIES COMPILE_OPTIONS "-Wall;-Werror")
4+
if(NOT "${CMAKE_CXX_STANDARD}")
5+
set(CMAKE_CXX_STANDARD 14)
6+
endif()
47
find_package(catkin REQUIRED COMPONENTS
58
geometry_msgs
69
nav_2d_msgs

dlux_global_planner/src/planner_node.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ class PlannerNode
7676

7777
gp_.initialize(nh, "planner", tf_, costmap_);
7878
goal_sub_ = nh.subscribe<geometry_msgs::PoseStamped>("/move_base_simple/goal", 1,
79-
boost::bind(&PlannerNode::goalCB, this, _1));
79+
std::bind(&PlannerNode::goalCB, this, std::placeholders::_1));
8080
pose_sub_ = nh.subscribe<geometry_msgs::PoseWithCovarianceStamped>("/initialpose", 1,
81-
boost::bind(&PlannerNode::poseCB, this, _1));
81+
std::bind(&PlannerNode::poseCB, this, std::placeholders::_1));
8282
nh.param("red", red_, 1.0);
8383
nh.param("green", green_, 1.0);
8484
nh.param("blue", blue_, 1.0);

dlux_plugins/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.10.2)
22
project(dlux_plugins)
3-
set_directory_properties(PROPERTIES COMPILE_OPTIONS "-std=c++11;-Wall;-Werror")
3+
set_directory_properties(PROPERTIES COMPILE_OPTIONS "-Wall;-Werror")
4+
if(NOT "${CMAKE_CXX_STANDARD}")
5+
set(CMAKE_CXX_STANDARD 14)
6+
endif()
47

58
find_package(catkin REQUIRED
69
COMPONENTS dlux_global_planner nav_core2 nav_grid pluginlib

dwb_critics/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.10.2)
22
project(dwb_critics)
33

4-
set_directory_properties(PROPERTIES COMPILE_OPTIONS "-std=c++11;-Wall;-Werror")
4+
set_directory_properties(PROPERTIES COMPILE_OPTIONS "-Wall;-Werror")
5+
if(NOT "${CMAKE_CXX_STANDARD}")
6+
set(CMAKE_CXX_STANDARD 14)
7+
endif()
58

69
find_package(catkin REQUIRED COMPONENTS
710
angles

dwb_local_planner/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.10.2)
22
project(dwb_local_planner)
33

4-
set_directory_properties(PROPERTIES COMPILE_OPTIONS "-std=c++11;-Wall;-Werror")
4+
set_directory_properties(PROPERTIES COMPILE_OPTIONS "-Wall;-Werror")
5+
if(NOT "${CMAKE_CXX_STANDARD}")
6+
set(CMAKE_CXX_STANDARD 14)
7+
endif()
58

69
find_package(catkin REQUIRED COMPONENTS
710
dwb_msgs

dwb_msgs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.10.2)
22
project(dwb_msgs)
33

44
find_package(catkin REQUIRED

dwb_plugins/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.10.2)
22
project(dwb_plugins)
33

4-
set_directory_properties(PROPERTIES COMPILE_OPTIONS "-std=c++11;-Wall;-Werror")
4+
set_directory_properties(PROPERTIES COMPILE_OPTIONS "-Wall;-Werror")
5+
if(NOT "${CMAKE_CXX_STANDARD}")
6+
set(CMAKE_CXX_STANDARD 14)
7+
endif()
58

69
find_package(catkin REQUIRED COMPONENTS angles dwb_local_planner dynamic_reconfigure nav_2d_msgs nav_2d_utils nav_core2 pluginlib roscpp)
710

dwb_plugins/src/kinematic_parameters.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void KinematicParameters::initialize(const ros::NodeHandle& nh)
8787
// the rest of the initial values are loaded through the dynamic reconfigure mechanisms
8888
dsrv_ = std::make_shared<dynamic_reconfigure::Server<KinematicParamsConfig> >(nh);
8989
dynamic_reconfigure::Server<KinematicParamsConfig>::CallbackType cb =
90-
boost::bind(&KinematicParameters::reconfigureCB, this, _1, _2);
90+
std::bind(&KinematicParameters::reconfigureCB, this, std::placeholders::_1, std::placeholders::_2);
9191
dsrv_->setCallback(cb);
9292
}
9393

global_planner_tests/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.10.2)
22
project(global_planner_tests)
3-
set_directory_properties(PROPERTIES COMPILE_OPTIONS "-std=c++11;-Wall;-Werror")
3+
set_directory_properties(PROPERTIES COMPILE_OPTIONS "-Wall;-Werror")
4+
if(NOT "${CMAKE_CXX_STANDARD}")
5+
set(CMAKE_CXX_STANDARD 14)
6+
endif()
47

58
find_package(catkin REQUIRED COMPONENTS map_server nav_core2 roscpp nav_msgs pluginlib)
69

0 commit comments

Comments
 (0)