Merge pull request #738 from AdamGoertz/galactic-devel

Update to ROS2 galactic
swri-robotics · Nov 17, 2021 · b846c0b · b846c0b
2 parents ee4b1ac + 87ca16d
commit b846c0b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,12 +7,10 @@ jobs:
     strategy:
       matrix:
         env:
-          - {ROS_DISTRO: dashing,  ROS_REPO: testing}
-          - {ROS_DISTRO: dashing,  ROS_REPO: main}
-          - {ROS_DISTRO: eloquent, ROS_REPO: testing}
-          - {ROS_DISTRO: eloquent, ROS_REPO: main}
-          - {ROS_DISTRO: foxy,     ROS_REPO: testing}
-          - {ROS_DISTRO: foxy,     ROS_REPO: main}
+          - {ROS_DISTRO: foxy,  ROS_REPO: testing}
+          - {ROS_DISTRO: foxy,  ROS_REPO: main}
+          - {ROS_DISTRO: galactic,  ROS_REPO: testing}
+          - {ROS_DISTRO: galactic,  ROS_REPO: main}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1

diff --git a/mapviz/src/mapviz.cpp b/mapviz/src/mapviz.cpp
@@ -68,7 +68,7 @@
 #include <mapviz/config_item.h>
 #include <QtGui/QtGui>
 
-#include <image_transport/image_transport.h>
+#include <image_transport/image_transport.hpp>
 
 // YAML libraries
 #include <yaml-cpp/yaml.h>

diff --git a/mapviz_plugins/include/mapviz_plugins/image_plugin.h b/mapviz_plugins/include/mapviz_plugins/image_plugin.h
@@ -44,7 +44,7 @@
 #include <sensor_msgs/msg/image.hpp>
 #include <opencv2/highgui.hpp>
 #include <cv_bridge/cv_bridge.h>
-#include <image_transport/image_transport.h>
+#include <image_transport/image_transport.hpp>
 
 #include <mapviz/map_canvas.h>
 

diff --git a/mapviz_plugins/src/textured_marker_plugin.cpp b/mapviz_plugins/src/textured_marker_plugin.cpp
@@ -47,12 +47,15 @@
 
 // C++ standard libraries
 #include <algorithm>
+#include <chrono>
 #include <cmath>
 #include <cstdio>
 #include <map>
 #include <string>
 #include <vector>
 
+using namespace std::chrono_literals;
+
 PLUGINLIB_EXPORT_CLASS(mapviz_plugins::TexturedMarkerPlugin, mapviz::MapvizPlugin)
 
 namespace mapviz_plugins
@@ -197,7 +200,7 @@ void TexturedMarkerPlugin::ProcessMarker(const marti_visualization_msgs::msg::Te
       markerData.expire_time = rclcpp::Time::max();
     } else {
       // Temporarily add 5 seconds to fix some existing markers.
-      markerData.expire_time = rclcpp::Time() + lifetime + rclcpp::Duration(5);
+      markerData.expire_time = rclcpp::Time() + lifetime + rclcpp::Duration(5s);
     }
 
     tf2::Transform offset(
@@ -289,7 +292,7 @@ void TexturedMarkerPlugin::ProcessMarker(const marti_visualization_msgs::msg::Te
       if (!markerData.texture_.empty() && marker.image.data.size() < expected) {
         RCLCPP_ERROR(
           node_->get_logger(),
-          "TexturedMarker image had expected data size %i but only got %i. Dropping message.",
+          "TexturedMarker image had expected data size %li but only got %li. Dropping message.",
           expected,
           marker.image.data.size());
         return;