diff --git a/CMakeLists.txt b/CMakeLists.txt index 0239b7ea99..e0d1280891 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ set (GAZEBO_MINOR_VERSION 10) # The patch version may have been bumped for prerelease purposes; be sure to # check gazebo-release/ubuntu/debian/changelog@default to determine what the # next patch version should be for a regular release. -set (GAZEBO_PATCH_VERSION 0) +set (GAZEBO_PATCH_VERSION 1) set (GAZEBO_VERSION ${GAZEBO_MAJOR_VERSION}.${GAZEBO_MINOR_VERSION}) set (GAZEBO_VERSION_FULL ${GAZEBO_MAJOR_VERSION}.${GAZEBO_MINOR_VERSION}.${GAZEBO_PATCH_VERSION}) diff --git a/Changelog.md b/Changelog.md index 1c29adf6e9..ec93460640 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,31 +1,39 @@ ## Gazebo 11 +## Gazebo 11.10.1 (2022-01-19) + +1. Revert boost/bind.hpp changes in header files + * [Pull request #3160](https://github.com/osrf/gazebo/pull/3160) + +1. Fix duplicate vertex program name Ogre crash + * [Pull request #3161](https://github.com/osrf/gazebo/pull/3161) + ## Gazebo 11.10.0 (2022-01-12) 1. Use boost/bind/bind.hpp to fix warnings on Arch Linux - * [Pull request #3156](https://github.com/ignitionrobotics/gazebo/pull/3156) + * [Pull request #3156](https://github.com/osrf/gazebo/pull/3156) * Inspired by a contribution from Alex Dewar 1. Fix focal builds: use python3 with check_test_ran.py - * [Pull request #3155](https://github.com/ignitionrobotics/gazebo/pull/3155) + * [Pull request #3155](https://github.com/osrf/gazebo/pull/3155) 1. Load model plugins even after sensor timeout - * [Pull request #3154](https://github.com/ignitionrobotics/gazebo/pull/3154) + * [Pull request #3154](https://github.com/osrf/gazebo/pull/3154) 1. CMake exports: remove -std=c++11 flag - * [Pull request #3050](https://github.com/ignitionrobotics/gazebo/pull/3050) + * [Pull request #3050](https://github.com/osrf/gazebo/pull/3050) * A contribution from Guilhem Saurel 1. Create github action ci - * [Pull request #3049](https://github.com/ignitionrobotics/gazebo/pull/3049) + * [Pull request #3049](https://github.com/osrf/gazebo/pull/3049) * A contribution from Tal Regev 1. Fix Windows build when using vcpkg - * [Pull request #3132](https://github.com/ignitionrobotics/gazebo/pull/3132) + * [Pull request #3132](https://github.com/osrf/gazebo/pull/3132) * A contribution from Akash Munagala 1. Point light shadows - * [Pull request #3051](https://github.com/ignitionrobotics/gazebo/pull/3051) + * [Pull request #3051](https://github.com/osrf/gazebo/pull/3051) ## Gazebo 11.9.1 (2021-12-02) diff --git a/gazebo/common/MovingWindowFilter.hh b/gazebo/common/MovingWindowFilter.hh index b4092e878d..24abfffb42 100644 --- a/gazebo/common/MovingWindowFilter.hh +++ b/gazebo/common/MovingWindowFilter.hh @@ -22,8 +22,12 @@ #include #include +// This fixes compiler warnings, see #3147 and #3160 +#ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS +#define BOOST_BIND_GLOBAL_PLACEHOLDERS +#endif +#include #include -#include #include #include diff --git a/gazebo/common/WeakBind.hh b/gazebo/common/WeakBind.hh index 58662e6761..e278d6fda1 100644 --- a/gazebo/common/WeakBind.hh +++ b/gazebo/common/WeakBind.hh @@ -18,8 +18,12 @@ #ifndef GAZEBO_COMMON_WEAKBIND_HH_ #define GAZEBO_COMMON_WEAKBIND_HH_ +// This fixes compiler warnings, see #3147 and #3160 +#ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS +#define BOOST_BIND_GLOBAL_PLACEHOLDERS +#endif +#include #include -#include namespace gazebo { diff --git a/gazebo/transport/Connection.hh b/gazebo/transport/Connection.hh index 0e7d88a32e..20634e02d9 100644 --- a/gazebo/transport/Connection.hh +++ b/gazebo/transport/Connection.hh @@ -20,8 +20,12 @@ #include #include +// This fixes compiler warnings, see #3147 and #3160 +#ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS +#define BOOST_BIND_GLOBAL_PLACEHOLDERS +#endif #include -#include +#include #include #include #include diff --git a/gazebo/transport/Node.hh b/gazebo/transport/Node.hh index b7d37f7cb1..26242874cd 100644 --- a/gazebo/transport/Node.hh +++ b/gazebo/transport/Node.hh @@ -19,7 +19,12 @@ #define GAZEBO_TRANSPORT_NODE_HH_ #include -#include + +// This fixes compiler warnings, see #3147 and #3160 +#ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS +#define BOOST_BIND_GLOBAL_PLACEHOLDERS +#endif +#include #include #include #include diff --git a/gazebo/transport/TopicManager.hh b/gazebo/transport/TopicManager.hh index bcbe4a7dd6..b2adc04c8d 100644 --- a/gazebo/transport/TopicManager.hh +++ b/gazebo/transport/TopicManager.hh @@ -17,7 +17,11 @@ #ifndef GAZEBO_TRANSPORT_TOPICMANAGER_HH_ #define GAZEBO_TRANSPORT_TOPICMANAGER_HH_ -#include +// This fixes compiler warnings, see #3147 and #3160 +#ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS +#define BOOST_BIND_GLOBAL_PLACEHOLDERS +#endif +#include #include #include #include diff --git a/gazebo/transport/TransportIface.hh b/gazebo/transport/TransportIface.hh index c6a6b77c86..4b5d6045c1 100644 --- a/gazebo/transport/TransportIface.hh +++ b/gazebo/transport/TransportIface.hh @@ -17,7 +17,11 @@ #ifndef _GAZEBO_TRANSPORTIFACE_HH_ #define _GAZEBO_TRANSPORTIFACE_HH_ -#include +// This fixes compiler warnings, see #3147 and #3160 +#ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS +#define BOOST_BIND_GLOBAL_PLACEHOLDERS +#endif +#include #include #include #include