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

ign -> gz Upstream Macro Migration : sdformat #1040

Merged
merged 6 commits into from
Jun 18, 2022
Merged
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
8 changes: 4 additions & 4 deletions include/sdf/Actor.hh
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ namespace sdf
public: void SetInterpolateX(bool _interpolateX);

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};

/// \brief Waypoint for Trajectory.
Expand Down Expand Up @@ -125,7 +125,7 @@ namespace sdf
public: void SetPose(const gz::math::Pose3d &_pose);

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};

/// \brief Trajectory for Animation.
Expand Down Expand Up @@ -183,7 +183,7 @@ namespace sdf
public: void AddWaypoint(const Waypoint &_waypoint);

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};


Expand Down Expand Up @@ -404,7 +404,7 @@ namespace sdf
public: void AddPlugin(const Plugin &_plugin);

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/AirPressure.hh
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Altimeter.hh
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Atmosphere.hh
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
6 changes: 3 additions & 3 deletions include/sdf/Box.hh
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ namespace sdf
/// not been called.
public: sdf::ElementPtr Element() const;

/// \brief Get the Ignition Math representation of this Box.
/// \brief Get the Gazebo Math representation of this Box.
/// \return A const reference to an gz::math::Boxd object.
public: const gz::math::Boxd &Shape() const;

/// \brief Get a mutable Ignition Math representation of this Box.
/// \brief Get a mutable Gazebo Math representation of this Box.
/// \return A reference to an gz::math::Boxd object.
public: gz::math::Boxd &Shape();

Expand All @@ -73,7 +73,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Camera.hh
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
6 changes: 3 additions & 3 deletions include/sdf/Capsule.hh
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ namespace sdf
/// not been called.
public: sdf::ElementPtr Element() const;

/// \brief Get the Ignition Math representation of this Capsule.
/// \brief Get the Gazebo Math representation of this Capsule.
/// \return A const reference to an gz::math::Sphered object.
public: const gz::math::Capsuled &Shape() const;

/// \brief Get a mutable Ignition Math representation of this Capsule.
/// \brief Get a mutable Gazebo Math representation of this Capsule.
/// \return A reference to an gz::math::Capsuled object.
public: gz::math::Capsuled &Shape();

Expand All @@ -80,7 +80,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Collision.hh
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ namespace sdf
friend class Link;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
6 changes: 3 additions & 3 deletions include/sdf/Cylinder.hh
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ namespace sdf
/// not been called.
public: sdf::ElementPtr Element() const;

/// \brief Get the Ignition Math representation of this Cylinder.
/// \brief Get the Gazebo Math representation of this Cylinder.
/// \return A const reference to an gz::math::Sphered object.
public: const gz::math::Cylinderd &Shape() const;

/// \brief Get a mutable Ignition Math representation of this Cylinder.
/// \brief Get a mutable Gazebo Math representation of this Cylinder.
/// \return A reference to an gz::math::Cylinderd object.
public: gz::math::Cylinderd &Shape();

Expand All @@ -80,7 +80,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
6 changes: 3 additions & 3 deletions include/sdf/Ellipsoid.hh
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ namespace sdf
/// not been called.
public: sdf::ElementPtr Element() const;

/// \brief Get the Ignition Math representation of this Ellipsoid.
/// \brief Get the Gazebo Math representation of this Ellipsoid.
/// \return A const reference to an gz::math::Ellipsoidd object.
public: const gz::math::Ellipsoidd &Shape() const;

/// \brief Get a mutable Ignition Math representation of this Ellipsoid.
/// \brief Get a mutable Gazebo Math representation of this Ellipsoid.
/// \return A reference to an gz::math::Ellipsoidd object.
public: gz::math::Ellipsoidd &Shape();

Expand All @@ -72,7 +72,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Error.hh
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ namespace sdf
std::ostream &_out, const sdf::Error &_err);

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Exception.hh
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ namespace sdf
}

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};

/// \class InternalError Exception.hh common/common.hh
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Filesystem.hh
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ namespace sdf
private: void close_handle();

/// \brief Private data.
IGN_UTILS_UNIQUE_IMPL_PTR(dataPtr)
GZ_UTILS_UNIQUE_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/ForceTorque.hh
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Frame.hh
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ namespace sdf
friend class World;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Geometry.hh
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Gui.hh
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ namespace sdf
public: sdf::Plugins &Plugins();

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
6 changes: 3 additions & 3 deletions include/sdf/Heightmap.hh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ namespace sdf
public: sdf::ElementPtr Element() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};

/// \brief Blend information to be used between textures on heightmaps.
Expand Down Expand Up @@ -111,7 +111,7 @@ namespace sdf
public: sdf::ElementPtr Element() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};

/// \brief Heightmap represents a shape defined by a 2D field, and is usually
Expand Down Expand Up @@ -222,7 +222,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Imu.hh
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/InterfaceElements.hh
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ class SDFORMAT_VISIBLE NestedInclude
public: sdf::ElementPtr includeElement SDF_DEPRECATED(12);

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
#ifdef _MSC_VER
#pragma warning(pop)
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/InterfaceFrame.hh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class SDFORMAT_VISIBLE InterfaceFrame
public: const gz::math::Pose3d &PoseInAttachedToFrame() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/InterfaceJoint.hh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class SDFORMAT_VISIBLE InterfaceJoint
public: const gz::math::Pose3d &PoseInChildFrame() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/InterfaceLink.hh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class SDFORMAT_VISIBLE InterfaceLink
public: const gz::math::Pose3d &PoseInModelFrame() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/InterfaceModel.hh
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class SDFORMAT_VISIBLE InterfaceModel
friend World;
friend Model;
/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/InterfaceModelPoseGraph.hh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class SDFORMAT_VISIBLE InterfaceModelPoseGraph

friend class InterfaceModel;
/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Joint.hh
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ namespace sdf
friend class Model;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/JointAxis.hh
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ namespace sdf
friend class Joint;

/// \brief Private data pointer
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Lidar.hh
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Light.hh
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ namespace sdf
friend class World;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Link.hh
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Magnetometer.hh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Material.hh
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Mesh.hh
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ namespace sdf
public: sdf::ElementPtr ToElement() const;

/// \brief Private data pointer.
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
Loading