Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ROS-O] required patches on current systems #2297

Open
wants to merge 12 commits into
base: noetic-devel
Choose a base branch
from
Open

[ROS-O] required patches on current systems #2297

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
88b9c7f
rosgraph: update code from Python 3.11
jspricke Nov 13, 2022
faa0422
Update header for Boost 1.83
jspricke Nov 16, 2023
e4e8ea0
Disable XmlRpcServer::enoughFreeFDs
jspricke Jun 20, 2024
c822b2f
Fixes for Python 3.12
doko42 Mar 17, 2024
aa0baa9
adding boost/bind/bind.hpp includes to files missing them
lucasw Aug 2, 2024
ff1baa3
add missing python dependency
v4hn Oct 11, 2024
4fb8ae2
test access to global symbols in list comprehension
rhaschke Aug 24, 2022
066967f
Fix symbol access in list comprehension
rhaschke Aug 24, 2022
49c1430
_eval(): better protection against use of hidden symbols
rhaschke Aug 24, 2022
a239220
Maintain constness of accessed XmlRpcValue struct
rhaschke Feb 21, 2023
27027a6
roslaunch: return exit code of a required process (#2082)
lucasw Jul 27, 2020
2a12474
Add missing newline in error message
LeroyR Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update header for Boost 1.83
  • Loading branch information
@jspricke @v4hn
jspricke authored and v4hn committed Oct 14, 2024
commit faa0422242f3b465cf932f0de97c5bd1bec9153a
12 changes: 12 additions & 0 deletions tools/rosbag/src/encrypt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@

#include <boost/scoped_ptr.hpp>
#include <boost/program_options.hpp>
#if BOOST_VERSION < 107200
#include <boost/progress.hpp>
#else
#include <boost/timer/progress_display.hpp>
#endif
#include <boost/regex.hpp>

#include <ros/ros.h>
Expand Down Expand Up @@ -161,9 +165,17 @@ int encrypt(EncryptorOptions const& options)
outbag.setEncryptorPlugin(options.plugin, options.param);
outbag.setCompression(options.compression);
rosbag::View view(inbag);
#if BOOST_VERSION < 107200
boost::scoped_ptr<boost::progress_display> progress;
#else
boost::scoped_ptr<boost::timer::progress_display> progress;
#endif
if (!options.quiet)
#if BOOST_VERSION < 107200
progress.reset(new boost::progress_display(view.size(), std::cout, "Progress:\n ", " ", " "));
#else
progress.reset(new boost::timer::progress_display(view.size(), std::cout, "Progress:\n ", " ", " "));
#endif
for (rosbag::View::const_iterator it = view.begin(); it != view.end(); ++it)
{
outbag.write(it->getTopic(), it->getTime(), *it, it->getConnectionHeader());
Expand Down