Merge fixes from 'melodic-devel' branch

ros-visualization · May 27, 2022 · d8df909 · d8df909
2 parents 02159c7 + 14216a6
commit d8df909
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/abi.yaml b/.github/workflows/abi.yaml
@@ -20,7 +20,7 @@ jobs:
       BASEDIR: /home/runner/work
       DOCKER_IMAGE: rhaschke/ici:rviz-${{ matrix.distro }}-${{ matrix.repo || 'ros' }}
       CACHE_PREFIX: ${{ matrix.distro }}
-      ABICHECK_URL: github:ros-visualization/rviz#1.14.14
+      ABICHECK_URL: github:ros-visualization/rviz#02159c7d59f12b3308497c8b46c6e62bc6c8f11a
 
     name: "check"
     runs-on: ubuntu-latest

diff --git a/src/rviz/pluginlib_factory.h b/src/rviz/pluginlib_factory.h
@@ -43,6 +43,8 @@
 #include <rviz/class_id_recording_factory.h>
 #include <rviz/load_resource.h>
 
+#include <ros/console.h>
+
 namespace rviz
 {
 template <class Type>