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.

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

Deprecating tf2 C Headers #573

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions test_tf2/test/buffer_core_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

#include <cmath>
#include <gtest/gtest.h>
#include <tf2/buffer_core.h>
#include "tf2/exceptions.h"
#include <tf2/buffer_core.hpp>
#include "tf2/exceptions.hpp"
#include <ros/ros.h>
#include "LinearMath/btVector3.h"
#include "LinearMath/btTransform.h"
Expand Down
2 changes: 1 addition & 1 deletion test_tf2/test/test_convert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* Author: Eitan Marder-Eppstein
*********************************************************************/
#include <gtest/gtest.h>
#include <tf2/convert.h>
#include <tf2/convert.hpp>
#include <tf2_kdl/tf2_kdl.h>
#include <tf2_bullet/tf2_bullet.h>
#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
Expand Down
2 changes: 1 addition & 1 deletion test_tf2/test/test_message_filter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


#include <tf2_ros/message_filter.h>
#include <tf2/buffer_core.h>
#include <tf2/buffer_core.hpp>
#include <geometry_msgs/PointStamped.h>
#include <boost/bind/bind.hpp>
#include <boost/scoped_ptr.hpp>
Expand Down
4 changes: 2 additions & 2 deletions test_tf2/test/test_static_publisher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
*/

#include <gtest/gtest.h>
#include <tf2/buffer_core.h>
#include "tf2/exceptions.h"
#include <tf2/buffer_core.hpp>
#include "tf2/exceptions.hpp"
#include <tf2_ros/static_transform_broadcaster.h>
#include <ros/ros.h>
#include "rostest/permuter.h"
Expand Down
2 changes: 1 addition & 1 deletion test_tf2/test/test_tf2_bullet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <tf2_ros/buffer.h>
#include <ros/ros.h>
#include <gtest/gtest.h>
#include <tf2/convert.h>
#include <tf2/convert.hpp>

tf2_ros::Buffer* tf_buffer;
static const double EPS = 1e-3;
Expand Down
2 changes: 1 addition & 1 deletion test_tf2/test/test_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

#include <gtest/gtest.h>
#include <tf2/utils.h>
#include <tf2/utils.hpp>
#include <tf2_kdl/tf2_kdl.h>
#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
#include <ros/time.h>
Expand Down
6 changes: 3 additions & 3 deletions tf2/include/tf2/convert.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
#define TF2_CONVERT_H


#include <tf2/transform_datatypes.h>
#include <tf2/exceptions.h>
#include <tf2/transform_datatypes.hpp>
#include <tf2/exceptions.hpp>
#include <geometry_msgs/TransformStamped.h>
#include <tf2/impl/convert.h>
#include <tf2/impl/convert.hpp>

namespace tf2 {

Expand Down
4 changes: 2 additions & 2 deletions tf2/include/tf2/impl/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#define TF2_IMPL_UTILS_H

#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
#include <tf2/transform_datatypes.h>
#include <tf2/LinearMath/Quaternion.h>
#include <tf2/transform_datatypes.hpp>
#include <tf2/LinearMath/Quaternion.hpp>

namespace tf2 {
namespace impl {
Expand Down
4 changes: 2 additions & 2 deletions tf2/include/tf2/transform_storage.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
#ifndef TF2_TRANSFORM_STORAGE_H
#define TF2_TRANSFORM_STORAGE_H

#include <tf2/LinearMath/Vector3.h>
#include <tf2/LinearMath/Quaternion.h>
#include <tf2/LinearMath/Vector3.hpp>
#include <tf2/LinearMath/Quaternion.hpp>

#include <ros/message_forward.h>
#include <ros/time.h>
Expand Down
10 changes: 5 additions & 5 deletions tf2/include/tf2/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
#ifndef TF2_UTILS_H
#define TF2_UTILS_H

#include <tf2/LinearMath/Transform.h>
#include <tf2/LinearMath/Quaternion.h>
#include <tf2/impl/utils.h>
#include <tf2/LinearMath/Transform.hpp>
#include <tf2/LinearMath/Quaternion.hpp>
#include <tf2/impl/utils.hpp>

namespace tf2 {
/** Return the yaw, pitch, roll of anything that can be converted to a tf2::Quaternion
* The conventions are the usual ROS ones defined in tf2/LineMath/Matrix3x3.h
* The conventions are the usual ROS ones defined in tf2/LinearMath/Matrix3x3.hpp
* \param a the object to get data from (it represents a rotation/quaternion)
* \param yaw yaw
* \param pitch pitch
Expand All @@ -35,7 +35,7 @@ template <class A>
}

/** Return the yaw of anything that can be converted to a tf2::Quaternion
* The conventions are the usual ROS ones defined in tf2/LineMath/Matrix3x3.h
* The conventions are the usual ROS ones defined in tf2/LinearMath/Matrix3x3.hpp
* This function is a specialization of getEulerYPR and is useful for its
* wide-spread use in navigation
* \param a the object to get data from (it represents a rotation/quaternion)
Expand Down
2 changes: 1 addition & 1 deletion tf2/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tf2 offers a templated conversion interface for external libraries to specify co
tf2-specific data types and user-defined data types. Various templated functions in tf2_ros use the
conversion interface to apply transformations from the tf server to these custom datatypes.

The conversion interface is defined in tf2/convert.h.
The conversion interface is defined in tf2/convert.hpp.

Some packages that implement this interface:

Expand Down
8 changes: 4 additions & 4 deletions tf2/src/buffer_core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@

/** \author Tully Foote */

#include "tf2/buffer_core.h"
#include "tf2/time_cache.h"
#include "tf2/exceptions.h"
#include "tf2/buffer_core.hpp"
#include "tf2/time_cache.hpp"
#include "tf2/exceptions.hpp"
#include "tf2_msgs/TF2Error.h"

#include <assert.h>
#include <console_bridge/console.h>
#include "tf2/LinearMath/Transform.h"
#include "tf2/LinearMath/Transform.hpp"
#include <boost/foreach.hpp>
#include <boost/tuple/tuple.hpp>

Expand Down
10 changes: 5 additions & 5 deletions tf2/src/cache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@

/** \author Tully Foote */

#include "tf2/time_cache.h"
#include "tf2/exceptions.h"
#include "tf2/time_cache.hpp"
#include "tf2/exceptions.hpp"

#include <tf2/LinearMath/Vector3.h>
#include <tf2/LinearMath/Quaternion.h>
#include <tf2/LinearMath/Transform.h>
#include <tf2/LinearMath/Vector3.hpp>
#include <tf2/LinearMath/Quaternion.hpp>
#include <tf2/LinearMath/Transform.hpp>
#include <geometry_msgs/TransformStamped.h>
#include <assert.h>

Expand Down
6 changes: 3 additions & 3 deletions tf2/src/static_cache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@

/** \author Tully Foote */

#include "tf2/time_cache.h"
#include "tf2/exceptions.h"
#include "tf2/time_cache.hpp"
#include "tf2/exceptions.hpp"

#include "tf2/LinearMath/Transform.h"
#include "tf2/LinearMath/Transform.hpp"


using namespace tf2;
Expand Down
4 changes: 2 additions & 2 deletions tf2/test/cache_unittest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
*/

#include <gtest/gtest.h>
#include <tf2/time_cache.h>
#include "tf2/LinearMath/Quaternion.h"
#include <tf2/time_cache.hpp>
#include "tf2/LinearMath/Quaternion.hpp"
#include <stdexcept>

#include <geometry_msgs/TransformStamped.h>
Expand Down
6 changes: 3 additions & 3 deletions tf2/test/simple_tf2_core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
*/

#include <gtest/gtest.h>
#include <tf2/buffer_core.h>
#include <tf2/buffer_core.hpp>
#include <ros/time.h>
#include "tf2/LinearMath/Vector3.h"
#include "tf2/exceptions.h"
#include "tf2/LinearMath/Vector3.hpp"
#include "tf2/exceptions.hpp"

TEST(tf2, setTransformFail)
{
Expand Down
2 changes: 1 addition & 1 deletion tf2/test/speed_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include <tf2/buffer_core.h>
#include <tf2/buffer_core.hpp>

#include <ros/time.h>
#include <console_bridge/console.h>
Expand Down
2 changes: 1 addition & 1 deletion tf2/test/static_cache_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*/

#include <gtest/gtest.h>
#include <tf2/time_cache.h>
#include <tf2/time_cache.hpp>
#include <stdexcept>

#include <geometry_msgs/TransformStamped.h>
Expand Down
2 changes: 1 addition & 1 deletion tf2/test/test_transform_datatypes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*/
#include <gtest/gtest.h>

#include "tf2/transform_datatypes.h"
#include "tf2/transform_datatypes.hpp"

#include <string>

Expand Down
10 changes: 5 additions & 5 deletions tf2_bullet/include/tf2_bullet/tf2_bullet.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#ifndef TF2_BULLET_H
#define TF2_BULLET_H

#include <tf2/convert.h>
#include <tf2/convert.hpp>
#include <LinearMath/btTransform.h>
#include <geometry_msgs/PointStamped.h>

Expand All @@ -53,7 +53,7 @@ btTransform transformToBullet(const geometry_msgs::TransformStamped& t)


/** \brief Apply a geometry_msgs TransformStamped to a Bullet-specific Vector3 type.
* This function is a specialization of the doTransform template defined in tf2/convert.h
* This function is a specialization of the doTransform template defined in tf2/convert.hpp
* \param t_in The vector to transform, as a timestamped Bullet btVector3 data type.
* \param t_out The transformed vector, as a timestamped Bullet btVector3 data type.
* \param transform The timestamped transform to apply, as a TransformStamped message.
Expand All @@ -66,7 +66,7 @@ inline
}

/** \brief Convert a stamped Bullet Vector3 type to a PointStamped message.
* This function is a specialization of the toMsg template defined in tf2/convert.h
* This function is a specialization of the toMsg template defined in tf2/convert.hpp
* \param in The timestamped Bullet btVector3 to convert.
* \return The vector converted to a PointStamped message.
*/
Expand All @@ -83,7 +83,7 @@ geometry_msgs::PointStamped toMsg(const tf2::Stamped<btVector3>& in)
}

/** \brief Convert a PointStamped message type to a stamped Bullet-specific Vector3 type.
* This function is a specialization of the fromMsg template defined in tf2/convert.h
* This function is a specialization of the fromMsg template defined in tf2/convert.hpp
* \param msg The PointStamped message to convert.
* \param out The point converted to a timestamped Bullet Vector3.
*/
Expand All @@ -99,7 +99,7 @@ void fromMsg(const geometry_msgs::PointStamped& msg, tf2::Stamped<btVector3>& ou


/** \brief Apply a geometry_msgs TransformStamped to a Bullet-specific Transform data type.
* This function is a specialization of the doTransform template defined in tf2/convert.h
* This function is a specialization of the doTransform template defined in tf2/convert.hpp
* \param t_in The frame to transform, as a timestamped Bullet btTransform.
* \param t_out The transformed frame, as a timestamped Bullet btTransform.
* \param transform The timestamped transform to apply, as a TransformStamped message.
Expand Down
2 changes: 1 addition & 1 deletion tf2_bullet/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ wiki page for more information about datatype conversion in tf2.
\section codeapi Code API

This library consists of one header only, tf2_bullet/tf2_bullet.h, which consists mostly of
specializations of template functions defined in tf2/convert.h.
specializations of template functions defined in tf2/convert.hpp.

*/
2 changes: 1 addition & 1 deletion tf2_bullet/test/test_tf2_bullet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include <tf2_bullet/tf2_bullet.h>
#include <gtest/gtest.h>
#include <tf2/convert.h>
#include <tf2/convert.hpp>

static const double EPS = 1e-3;

Expand Down
Loading