Merge pull request #50 from lucasw/build_ubuntu2310

Update included headers for compatibility with Ubuntu 23
ethz-asl · Dec 11, 2023 · 89177ee · 89177ee
2 parents 5e827cd + 004ea20
commit 89177ee
Show file tree

Hide file tree

Showing 26 changed files with 53 additions and 13 deletions.
diff --git a/examples/CHANGELOG.rst b/examples/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_examples
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.6.2 (2023-12-11)
+------------------
+
 1.6.1 (2023-11-20)
 ------------------
 

diff --git a/examples/package.xml b/examples/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_examples</name>
-  <version>1.6.1</version>
+  <version>1.6.2</version>
   <description>Usages examples for wavemap.</description>
 
   <maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>

diff --git a/libraries/wavemap/CHANGELOG.rst b/libraries/wavemap/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package wavemap
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.6.2 (2023-12-11)
+------------------
+* Include <optional> for std::optional
+* Contributors: Lucas Walter
+
 1.6.1 (2023-11-20)
 ------------------
 

diff --git a/libraries/wavemap/include/wavemap/config/param.h b/libraries/wavemap/include/wavemap/config/param.h
@@ -2,6 +2,7 @@
 #define WAVEMAP_CONFIG_PARAM_H_
 
 #include <map>
+#include <optional>
 #include <string>
 #include <variant>
 #include <vector>

diff --git a/libraries/wavemap/package.xml b/libraries/wavemap/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap</name>
-  <version>1.6.1</version>
+  <version>1.6.2</version>
   <description>Base library for wavemap.</description>
 
   <maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>

diff --git a/libraries/wavemap_io/CHANGELOG.rst b/libraries/wavemap_io/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_io
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.6.2 (2023-12-11)
+------------------
+
 1.6.1 (2023-11-20)
 ------------------
 

diff --git a/libraries/wavemap_io/package.xml b/libraries/wavemap_io/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_io</name>
-  <version>1.6.1</version>
+  <version>1.6.2</version>
   <description>(De)serialization of wavemap types to files.</description>
 
   <maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>

diff --git a/ros/wavemap_msgs/CHANGELOG.rst b/ros/wavemap_msgs/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.6.2 (2023-12-11)
+------------------
+
 1.6.1 (2023-11-20)
 ------------------
 

diff --git a/ros/wavemap_msgs/package.xml b/ros/wavemap_msgs/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_msgs</name>
-  <version>1.6.1</version>
+  <version>1.6.2</version>
   <description>Message definitions for wavemap's ROS interfaces.</description>
 
   <maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>

diff --git a/ros/wavemap_ros/CHANGELOG.rst b/ros/wavemap_ros/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package wavemap_ros
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.6.2 (2023-12-11)
+------------------
+* Include <optional> for std::optional
+* Contributors: Lucas Walter
+
 1.6.1 (2023-11-20)
 ------------------
 * Add config for Ouster OS0 + Pico Monstar

diff --git a/ros/wavemap_ros/include/wavemap_ros/rosbag_processor.h b/ros/wavemap_ros/include/wavemap_ros/rosbag_processor.h
@@ -4,6 +4,7 @@
 #include <functional>
 #include <list>
 #include <map>
+#include <optional>
 #include <string>
 
 #include <glog/logging.h>

diff --git a/ros/wavemap_ros/package.xml b/ros/wavemap_ros/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_ros</name>
-  <version>1.6.1</version>
+  <version>1.6.2</version>
   <description>ROS interface for wavemap.</description>
 
   <maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>

diff --git a/ros/wavemap_ros_conversions/CHANGELOG.rst b/ros/wavemap_ros_conversions/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_ros_conversions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.6.2 (2023-12-11)
+------------------
+
 1.6.1 (2023-11-20)
 ------------------
 

diff --git a/ros/wavemap_ros_conversions/package.xml b/ros/wavemap_ros_conversions/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_ros_conversions</name>
-  <version>1.6.1</version>
+  <version>1.6.2</version>
   <description>Conversions between wavemap and ROS types.</description>
 
   <maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>

diff --git a/ros/wavemap_rviz_plugin/CHANGELOG.rst b/ros/wavemap_rviz_plugin/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package wavemap_rviz_plugin
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.6.2 (2023-12-11)
+------------------
+* Update included Ogre and Rviz headers to support Ubuntu 23
+* Include <optional> for std::optional
+* Contributors: Lucas Walter
+
 1.6.1 (2023-11-20)
 ------------------
 

diff --git a/ros/wavemap_rviz_plugin/include/wavemap_rviz_plugin/utils/button_property.h b/ros/wavemap_rviz_plugin/include/wavemap_rviz_plugin/utils/button_property.h
@@ -2,6 +2,7 @@
 #define WAVEMAP_RVIZ_PLUGIN_UTILS_BUTTON_PROPERTY_H_
 
 #ifndef Q_MOC_RUN
+#include <optional>
 #include <string>
 #include <utility>
 

diff --git a/ros/wavemap_rviz_plugin/include/wavemap_rviz_plugin/visuals/slice_visual.h b/ros/wavemap_rviz_plugin/include/wavemap_rviz_plugin/visuals/slice_visual.h
@@ -5,10 +5,10 @@
 #include <memory>
 #include <vector>
 
+#include <OGRE/Ogre.h>
 #include <OGRE/OgreQuaternion.h>
 #include <OGRE/OgreSceneManager.h>
 #include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreVector3.h>
 #include <rviz/properties/bool_property.h>
 #include <rviz/properties/color_property.h>
 #include <rviz/properties/float_property.h>

diff --git a/ros/wavemap_rviz_plugin/include/wavemap_rviz_plugin/visuals/voxel_visual.h b/ros/wavemap_rviz_plugin/include/wavemap_rviz_plugin/visuals/voxel_visual.h
@@ -6,10 +6,10 @@
 #include <unordered_map>
 #include <vector>
 
+#include <OGRE/Ogre.h>
 #include <OGRE/OgreQuaternion.h>
 #include <OGRE/OgreSceneManager.h>
 #include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreVector3.h>
 #include <rviz/properties/bool_property.h>
 #include <rviz/properties/color_property.h>
 #include <rviz/properties/enum_property.h>

diff --git a/ros/wavemap_rviz_plugin/package.xml b/ros/wavemap_rviz_plugin/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_rviz_plugin</name>
-  <version>1.6.1</version>
+  <version>1.6.2</version>
   <description>Plugin to interactively visualize maps published in wavemap's
     native format.
   </description>

diff --git a/ros/wavemap_rviz_plugin/src/wavemap_map_display.cc b/ros/wavemap_rviz_plugin/src/wavemap_map_display.cc
@@ -313,5 +313,5 @@ WavemapMapDisplay::resolveWavemapServerNamespaceFromMapTopic(
 }  // namespace wavemap::rviz_plugin
 
 // Tell pluginlib about this class.
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 PLUGINLIB_EXPORT_CLASS(wavemap::rviz_plugin::WavemapMapDisplay, rviz::Display)
diff --git a/tooling/packages/catkin_setup/CHANGELOG.rst b/tooling/packages/catkin_setup/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package catkin_setup
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.6.2 (2023-12-11)
+------------------
+
 1.6.1 (2023-11-20)
 ------------------
 

diff --git a/tooling/packages/catkin_setup/package.xml b/tooling/packages/catkin_setup/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>catkin_setup</name>
-    <version>1.6.1</version>
+    <version>1.6.2</version>
     <description>Dummy package to make it easy to setup the workspace and generate the setup.[sh|bash|zsh] scripts in CI.</description>
 
     <maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>

diff --git a/tooling/packages/wavemap_all/CHANGELOG.rst b/tooling/packages/wavemap_all/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_all
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.6.2 (2023-12-11)
+------------------
+
 1.6.1 (2023-11-20)
 ------------------
 

diff --git a/tooling/packages/wavemap_all/package.xml b/tooling/packages/wavemap_all/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_all</name>
-  <version>1.6.1</version>
+  <version>1.6.2</version>
   <description>Metapackage that builds all wavemap packages.</description>
 
   <maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>

diff --git a/tooling/packages/wavemap_utils/CHANGELOG.rst b/tooling/packages/wavemap_utils/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_utils
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.6.2 (2023-12-11)
+------------------
+
 1.6.1 (2023-11-20)
 ------------------
 * Add Dockerfile and scripts to run the demo in Docker

diff --git a/tooling/packages/wavemap_utils/package.xml b/tooling/packages/wavemap_utils/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>wavemap_utils</name>
-    <version>1.6.1</version>
+    <version>1.6.2</version>
     <description>Small package containing scripts to simplify common wavemap development tasks.</description>
 
     <maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>