diff options
| -rw-r--r-- | moveit-ros-benchmarks-fix-boost-progress.patch | 16 | ||||
| -rw-r--r-- | moveit-ros-benchmarks.spec | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/moveit-ros-benchmarks-fix-boost-progress.patch b/moveit-ros-benchmarks-fix-boost-progress.patch index ffbc478..90a830b 100644 --- a/moveit-ros-benchmarks-fix-boost-progress.patch +++ b/moveit-ros-benchmarks-fix-boost-progress.patch @@ -1,18 +1,22 @@ --- a/moveit-ros-benchmarks-2.5.9/src/BenchmarkExecutor.cpp +++ b/moveit-ros-benchmarks-2.5.9/src/BenchmarkExecutor.cpp -@@ -39,12 +39,11 @@ - - #include <moveit/utils/moveit_error_code.h> +@@ -40,11 +40,8 @@ + #include <tf2_eigen/tf2_eigen.hpp> -// TODO(henningkayser): Switch to boost/timer/progress_display.hpp with Boost 1.72 -// boost/progress.hpp is deprecated and will be replaced by boost/timer/progress_display.hpp in Boost 1.72. +-// Until then we need to suppress the deprecation warning. +-#define BOOST_ALLOW_DEPRECATED_HEADERS +// Use boost/timer/progress_display.hpp (available since Boost 1.72) +// instead of the deprecated boost/progress.hpp - #include <boost/regex.hpp> -#include <boost/progress.hpp> -- +-#undef BOOST_ALLOW_DEPRECATED_HEADERS +#include <boost/timer/progress_display.hpp> #include <boost/date_time/posix_time/posix_time.hpp> - #include <boost/math/constants/constants.hpp> + #include <math.h> +@@ -784,3 +781,3 @@ + +- boost::progress_display progress(num_planners * runs, std::cout); ++ boost::timer::progress_display progress(num_planners * runs, std::cout); diff --git a/moveit-ros-benchmarks.spec b/moveit-ros-benchmarks.spec index 1d60ac0..896003d 100644 --- a/moveit-ros-benchmarks.spec +++ b/moveit-ros-benchmarks.spec @@ -11,7 +11,7 @@ Name: ros-%{ros_distro}-%{RosPkgName} Version: 2.5.9 -Release: 4%{?dist}%{?release_suffix} +Release: 5%{?dist}%{?release_suffix} Summary: Enhanced tools for benchmarks in MoveIt Url: http://moveit.ai |