-
Notifications
You must be signed in to change notification settings - Fork 254
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
3fac836
commit 2f959a9
Showing
7 changed files
with
131 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| diff --git a/tools/rosbag_storage/src/bag.cpp b/tools/rosbag_storage/src/bag.cpp | ||
| index 073072934..13a7fc8fc 100644 | ||
| --- a/tools/rosbag_storage/src/bag.cpp | ||
| +++ b/tools/rosbag_storage/src/bag.cpp | ||
| @@ -58,12 +58,13 @@ using ros::Time; | ||
|
|
||
| namespace rosbag { | ||
|
|
||
| -Bag::Bag() : encryptor_loader_("rosbag_storage", "rosbag::EncryptorBase") | ||
| +Bag::Bag() : encryptor_loader_("ros1_rosbag_storage", "rosbag::EncryptorBase") | ||
| { | ||
| init(); | ||
| } | ||
|
|
||
| -Bag::Bag(string const& filename, uint32_t mode) : encryptor_loader_("rosbag_storage", "rosbag::EncryptorBase") | ||
| +Bag::Bag(string const& filename, uint32_t mode) | ||
| +: encryptor_loader_("ros1_rosbag_storage", "rosbag::EncryptorBase") | ||
| { | ||
| init(); | ||
| open(filename, mode); | ||
| @@ -71,7 +72,7 @@ Bag::Bag(string const& filename, uint32_t mode) : encryptor_loader_("rosbag_stor | ||
|
|
||
| #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES | ||
|
|
||
| -Bag::Bag(Bag&& other) : encryptor_loader_("rosbag_storage", "rosbag::EncryptorBase") { | ||
| +Bag::Bag(Bag&& other) : encryptor_loader_("ros1_rosbag_storage", "rosbag::EncryptorBase") { | ||
| init(); | ||
| swap(other); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| diff --git a/tools/rosbag_storage/include/rosbag/bag.h b/tools/rosbag_storage/include/rosbag/bag.h | ||
| index c65533011..e75ef9c78 100644 | ||
| --- a/tools/rosbag_storage/include/rosbag/bag.h | ||
| +++ b/tools/rosbag_storage/include/rosbag/bag.h | ||
| @@ -35,6 +35,8 @@ | ||
| #ifndef ROSBAG_BAG_H | ||
| #define ROSBAG_BAG_H | ||
|
|
||
| +#include <memory> | ||
| + | ||
| #include "rosbag/macros.h" | ||
|
|
||
| #include "rosbag/buffer.h" | ||
| @@ -354,7 +356,7 @@ private: | ||
| // Encryptor plugin loader | ||
| pluginlib::ClassLoader<rosbag::EncryptorBase> encryptor_loader_; | ||
| // Active encryptor | ||
| - boost::shared_ptr<rosbag::EncryptorBase> encryptor_; | ||
| + std::shared_ptr<rosbag::EncryptorBase> encryptor_; | ||
| }; | ||
|
|
||
| } // namespace rosbag |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| diff --git a/tools/rosbag_storage/package.xml b/tools/rosbag_storage/package.xml | ||
| index 502f5308b..3f28d00f1 100644 | ||
| --- a/tools/rosbag_storage/package.xml | ||
| +++ b/tools/rosbag_storage/package.xml | ||
| @@ -1,5 +1,5 @@ | ||
| -<package> | ||
| - <name>rosbag_storage</name> | ||
| +<package format="2"> | ||
| + <name>ros1_rosbag_storage</name> | ||
| <version>1.14.3</version> | ||
| <description> | ||
| This is a set of tools for recording from and playing back ROS | ||
| @@ -8,35 +8,25 @@ | ||
| <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer> | ||
| <license>BSD</license> | ||
|
|
||
| - <buildtool_depend>catkin</buildtool_depend> | ||
| + <buildtool_depend>ament_cmake</buildtool_depend> | ||
|
|
||
| + <build_depend>ros1_bridge</build_depend> | ||
| <build_depend>boost</build_depend> | ||
| <build_depend>bzip2</build_depend> | ||
| - <build_depend version_gte="0.3.17">cpp_common</build_depend> | ||
| + <build_depend>cpp_common</build_depend> | ||
| <build_depend>libconsole-bridge-dev</build_depend> | ||
| <build_depend>libgpgme-dev</build_depend> | ||
| <build_depend>libssl-dev</build_depend> | ||
| <build_depend>pluginlib</build_depend> | ||
| - <build_depend>roscpp_serialization</build_depend> | ||
| - <build_depend version_gte="0.3.17">roscpp_traits</build_depend> | ||
| - <build_depend>rostest</build_depend> | ||
| - <build_depend>rostime</build_depend> | ||
| - <build_depend>roslz4</build_depend> | ||
|
|
||
| - <run_depend>boost</run_depend> | ||
| - <run_depend>bzip2</run_depend> | ||
| - <run_depend version_gte="0.3.17">cpp_common</run_depend> | ||
| - <run_depend>libconsole-bridge-dev</run_depend> | ||
| - <run_depend>libgpgme-dev</run_depend> | ||
| - <run_depend>libssl-dev</run_depend> | ||
| - <run_depend>pluginlib</run_depend> | ||
| - <run_depend>roscpp_serialization</run_depend> | ||
| - <run_depend version_gte="0.3.17">roscpp_traits</run_depend> | ||
| - <run_depend>rostime</run_depend> | ||
| - <run_depend>roslz4</run_depend> | ||
| + <exec_depend>boost</exec_depend> | ||
| + <exec_depend>bzip2</exec_depend> | ||
| + <exec_depend>libconsole-bridge-dev</exec_depend> | ||
| + <exec_depend>libgpgme-dev</exec_depend> | ||
| + <exec_depend>libssl-dev</exec_depend> | ||
| + <exec_depend>pluginlib</exec_depend> | ||
|
|
||
| <export> | ||
| - <rosdoc config="${prefix}/rosdoc.yaml"/> | ||
| - <rosbag_storage plugin="${prefix}/encryptor_plugins.xml" /> | ||
| + <build_type>ament_cmake</build_type> | ||
| </export> | ||
| </package> |
10 changes: 10 additions & 0 deletions
10
ros1_rosbag_storage_vendor/resources/plugin_descriptionxml.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| diff --git a/tools/rosbag_storage/encryptor_plugins.xml b/tools/rosbag_storage/encryptor_plugins.xml | ||
| index 3128ec9a5..fb66f450c 100644 | ||
| --- a/tools/rosbag_storage/encryptor_plugins.xml | ||
| +++ b/tools/rosbag_storage/encryptor_plugins.xml | ||
| @@ -1,4 +1,4 @@ | ||
| -<library path="lib/librosbag_default_encryption_plugins"> | ||
| +<library path="rosbag_default_encryption_plugins"> | ||
| <class name="rosbag/NoEncryptor" type="rosbag::NoEncryptor" base_class_type="rosbag::EncryptorBase"> | ||
| <description>This is a plugin for no encryption.</description> | ||
| </class> |