Skip to content

Commit 3825e48

Browse files
authored
[RST-4186] Fix fuse macro names (#263)
* Namespace all macros with the FUSE_ prefix. Mark original macros as deprecated. * Update all fuse objects to use the new macro names
1 parent df2b288 commit 3825e48

File tree

76 files changed

+281
-107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+281
-107
lines changed

fuse_constraints/include/fuse_constraints/absolute_constraint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include <fuse_core/constraint.h>
3838
#include <fuse_core/eigen.h>
39-
#include <fuse_core/macros.h>
39+
#include <fuse_core/fuse_macros.h>
4040
#include <fuse_core/serialization.h>
4141
#include <fuse_core/uuid.h>
4242
#include <fuse_variables/acceleration_angular_2d_stamped.h>

fuse_constraints/include/fuse_constraints/absolute_orientation_3d_stamped_constraint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include <fuse_core/constraint.h>
3838
#include <fuse_core/eigen.h>
39-
#include <fuse_core/macros.h>
39+
#include <fuse_core/fuse_macros.h>
4040
#include <fuse_core/serialization.h>
4141
#include <fuse_core/uuid.h>
4242
#include <fuse_variables/orientation_3d_stamped.h>

fuse_constraints/include/fuse_constraints/absolute_orientation_3d_stamped_euler_constraint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include <fuse_core/constraint.h>
3838
#include <fuse_core/eigen.h>
39-
#include <fuse_core/macros.h>
39+
#include <fuse_core/fuse_macros.h>
4040
#include <fuse_core/serialization.h>
4141
#include <fuse_core/uuid.h>
4242
#include <fuse_variables/orientation_3d_stamped.h>

fuse_constraints/include/fuse_constraints/absolute_pose_2d_stamped_constraint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include <fuse_core/constraint.h>
3838
#include <fuse_core/eigen.h>
39-
#include <fuse_core/macros.h>
39+
#include <fuse_core/fuse_macros.h>
4040
#include <fuse_core/serialization.h>
4141
#include <fuse_core/uuid.h>
4242
#include <fuse_variables/orientation_2d_stamped.h>

fuse_constraints/include/fuse_constraints/absolute_pose_3d_stamped_constraint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include <fuse_core/constraint.h>
3838
#include <fuse_core/eigen.h>
39-
#include <fuse_core/macros.h>
39+
#include <fuse_core/fuse_macros.h>
4040
#include <fuse_core/serialization.h>
4141
#include <fuse_core/uuid.h>
4242
#include <fuse_variables/orientation_3d_stamped.h>

fuse_constraints/include/fuse_constraints/marginal_constraint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <fuse_core/constraint.h>
3838
#include <fuse_core/eigen.h>
3939
#include <fuse_core/local_parameterization.h>
40-
#include <fuse_core/macros.h>
40+
#include <fuse_core/fuse_macros.h>
4141
#include <fuse_core/serialization.h>
4242
#include <fuse_core/variable.h>
4343

fuse_constraints/include/fuse_constraints/marginalize_variables.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include <fuse_core/eigen.h>
4141
#include <fuse_core/graph.h>
4242
#include <fuse_core/local_parameterization.h>
43-
#include <fuse_core/macros.h>
43+
#include <fuse_core/fuse_macros.h>
4444
#include <fuse_core/transaction.h>
4545
#include <fuse_core/variable.h>
4646

fuse_constraints/include/fuse_constraints/normal_delta_orientation_3d_cost_functor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define FUSE_CONSTRAINTS_NORMAL_DELTA_ORIENTATION_3D_COST_FUNCTOR_H
3636

3737
#include <fuse_core/eigen.h>
38-
#include <fuse_core/macros.h>
38+
#include <fuse_core/fuse_macros.h>
3939
#include <fuse_core/util.h>
4040
#include <fuse_variables/orientation_3d_stamped.h>
4141

fuse_constraints/include/fuse_constraints/normal_delta_pose_2d_cost_functor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define FUSE_CONSTRAINTS_NORMAL_DELTA_POSE_2D_COST_FUNCTOR_H
3636

3737
#include <fuse_core/eigen.h>
38-
#include <fuse_core/macros.h>
38+
#include <fuse_core/fuse_macros.h>
3939
#include <fuse_core/util.h>
4040

4141
#include <Eigen/Core>

fuse_constraints/include/fuse_constraints/normal_delta_pose_3d_cost_functor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include <fuse_constraints/normal_delta_orientation_3d_cost_functor.h>
3838
#include <fuse_core/eigen.h>
39-
#include <fuse_core/macros.h>
39+
#include <fuse_core/fuse_macros.h>
4040
#include <fuse_core/util.h>
4141

4242
#include <ceres/rotation.h>

fuse_constraints/include/fuse_constraints/normal_prior_orientation_3d_cost_functor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define FUSE_CONSTRAINTS_NORMAL_PRIOR_ORIENTATION_3D_COST_FUNCTOR_H
3636

3737
#include <fuse_core/eigen.h>
38-
#include <fuse_core/macros.h>
38+
#include <fuse_core/fuse_macros.h>
3939
#include <fuse_core/util.h>
4040
#include <fuse_variables/orientation_3d_stamped.h>
4141

fuse_constraints/include/fuse_constraints/normal_prior_pose_2d_cost_functor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define FUSE_CONSTRAINTS_NORMAL_PRIOR_POSE_2D_COST_FUNCTOR_H
3636

3737
#include <fuse_core/eigen.h>
38-
#include <fuse_core/macros.h>
38+
#include <fuse_core/fuse_macros.h>
3939
#include <fuse_core/util.h>
4040

4141
#include <Eigen/Core>

fuse_constraints/include/fuse_constraints/normal_prior_pose_3d_cost_functor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include <fuse_constraints/normal_prior_orientation_3d_cost_functor.h>
3838
#include <fuse_core/eigen.h>
39-
#include <fuse_core/macros.h>
39+
#include <fuse_core/fuse_macros.h>
4040
#include <fuse_core/util.h>
4141

4242
#include <Eigen/Core>

fuse_constraints/include/fuse_constraints/relative_constraint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include <fuse_core/constraint.h>
3838
#include <fuse_core/eigen.h>
39-
#include <fuse_core/macros.h>
39+
#include <fuse_core/fuse_macros.h>
4040
#include <fuse_core/serialization.h>
4141
#include <fuse_core/uuid.h>
4242
#include <fuse_variables/acceleration_angular_2d_stamped.h>

fuse_constraints/include/fuse_constraints/relative_orientation_3d_stamped_constraint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include <fuse_core/constraint.h>
3838
#include <fuse_core/eigen.h>
39-
#include <fuse_core/macros.h>
39+
#include <fuse_core/fuse_macros.h>
4040
#include <fuse_core/serialization.h>
4141
#include <fuse_core/uuid.h>
4242
#include <fuse_variables/orientation_3d_stamped.h>

fuse_constraints/include/fuse_constraints/relative_pose_2d_stamped_constraint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include <fuse_core/constraint.h>
3838
#include <fuse_core/eigen.h>
39-
#include <fuse_core/macros.h>
39+
#include <fuse_core/fuse_macros.h>
4040
#include <fuse_core/serialization.h>
4141
#include <fuse_core/uuid.h>
4242
#include <fuse_variables/orientation_2d_stamped.h>

fuse_constraints/include/fuse_constraints/relative_pose_3d_stamped_constraint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include <fuse_core/constraint.h>
3838
#include <fuse_core/eigen.h>
39-
#include <fuse_core/macros.h>
39+
#include <fuse_core/fuse_macros.h>
4040
#include <fuse_core/serialization.h>
4141
#include <fuse_core/uuid.h>
4242
#include <fuse_variables/orientation_3d_stamped.h>

fuse_core/include/fuse_core/async_motion_model.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define FUSE_CORE_ASYNC_MOTION_MODEL_H
3636

3737
#include <fuse_core/graph.h>
38-
#include <fuse_core/macros.h>
38+
#include <fuse_core/fuse_macros.h>
3939
#include <fuse_core/motion_model.h>
4040
#include <fuse_core/transaction.h>
4141
#include <ros/callback_queue.h>
@@ -85,7 +85,7 @@ namespace fuse_core
8585
class AsyncMotionModel : public MotionModel
8686
{
8787
public:
88-
SMART_PTR_ALIASES_ONLY(AsyncMotionModel);
88+
FUSE_SMART_PTR_ALIASES_ONLY(AsyncMotionModel);
8989

9090
/**
9191
* @brief Destructor

fuse_core/include/fuse_core/async_publisher.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define FUSE_CORE_ASYNC_PUBLISHER_H
3636

3737
#include <fuse_core/graph.h>
38-
#include <fuse_core/macros.h>
38+
#include <fuse_core/fuse_macros.h>
3939
#include <fuse_core/publisher.h>
4040
#include <fuse_core/transaction.h>
4141
#include <ros/callback_queue.h>
@@ -63,7 +63,7 @@ namespace fuse_core
6363
class AsyncPublisher : public Publisher
6464
{
6565
public:
66-
SMART_PTR_ALIASES_ONLY(AsyncPublisher);
66+
FUSE_SMART_PTR_ALIASES_ONLY(AsyncPublisher);
6767

6868
/**
6969
* @brief Destructor

fuse_core/include/fuse_core/async_sensor_model.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define FUSE_CORE_ASYNC_SENSOR_MODEL_H
3636

3737
#include <fuse_core/graph.h>
38-
#include <fuse_core/macros.h>
38+
#include <fuse_core/fuse_macros.h>
3939
#include <fuse_core/sensor_model.h>
4040
#include <fuse_core/transaction.h>
4141
#include <ros/callback_queue.h>
@@ -87,7 +87,7 @@ namespace fuse_core
8787
class AsyncSensorModel : public SensorModel
8888
{
8989
public:
90-
SMART_PTR_ALIASES_ONLY(AsyncSensorModel);
90+
FUSE_SMART_PTR_ALIASES_ONLY(AsyncSensorModel);
9191

9292
/**
9393
* @brief Destructor

fuse_core/include/fuse_core/autodiff_local_parameterization.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include <fuse_core/local_parameterization.h>
3838
#include <fuse_core/ceres_options.h>
39-
#include <fuse_core/macros.h>
39+
#include <fuse_core/fuse_macros.h>
4040

4141
#include <ceres/internal/autodiff.h>
4242

@@ -77,7 +77,7 @@ template <typename PlusFunctor, typename MinusFunctor, int kGlobalSize, int kLoc
7777
class AutoDiffLocalParameterization : public LocalParameterization
7878
{
7979
public:
80-
SMART_PTR_DEFINITIONS(AutoDiffLocalParameterization<PlusFunctor, MinusFunctor, kGlobalSize, kLocalSize>);
80+
FUSE_SMART_PTR_DEFINITIONS(AutoDiffLocalParameterization<PlusFunctor, MinusFunctor, kGlobalSize, kLocalSize>);
8181

8282
/**
8383
* @brief Constructs new PlusFunctor and MinusFunctor instances

fuse_core/include/fuse_core/constraint.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define FUSE_CORE_CONSTRAINT_H
3636

3737
#include <fuse_core/loss.h>
38-
#include <fuse_core/macros.h>
38+
#include <fuse_core/fuse_macros.h>
3939
#include <fuse_core/serialization.h>
4040
#include <fuse_core/uuid.h>
4141

@@ -145,7 +145,7 @@
145145
* @endcode
146146
*/
147147
#define FUSE_CONSTRAINT_DEFINITIONS(...) \
148-
SMART_PTR_DEFINITIONS(__VA_ARGS__) \
148+
FUSE_SMART_PTR_DEFINITIONS(__VA_ARGS__) \
149149
FUSE_CONSTRAINT_TYPE_DEFINITION(__VA_ARGS__) \
150150
FUSE_CONSTRAINT_CLONE_DEFINITION(__VA_ARGS__) \
151151
FUSE_CONSTRAINT_SERIALIZE_DEFINITION(__VA_ARGS__)
@@ -165,7 +165,7 @@
165165
* @endcode
166166
*/
167167
#define FUSE_CONSTRAINT_DEFINITIONS_WITH_EIGEN(...) \
168-
SMART_PTR_DEFINITIONS_WITH_EIGEN(__VA_ARGS__) \
168+
FUSE_SMART_PTR_DEFINITIONS_WITH_EIGEN(__VA_ARGS__) \
169169
FUSE_CONSTRAINT_TYPE_DEFINITION(__VA_ARGS__) \
170170
FUSE_CONSTRAINT_CLONE_DEFINITION(__VA_ARGS__) \
171171
FUSE_CONSTRAINT_SERIALIZE_DEFINITION(__VA_ARGS__)
@@ -193,7 +193,7 @@ namespace fuse_core
193193
class Constraint
194194
{
195195
public:
196-
SMART_PTR_ALIASES_ONLY(Constraint);
196+
FUSE_SMART_PTR_ALIASES_ONLY(Constraint);
197197

198198
/**
199199
* @brief Default constructor

0 commit comments

Comments
 (0)