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 Header Migration : sdformat #1008

Merged
merged 1 commit into from
May 4, 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
4 changes: 2 additions & 2 deletions include/sdf/Actor.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <memory>
#include <string>

#include <ignition/math/Pose3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>

#include "sdf/Element.hh"
#include "sdf/Types.hh"
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/AirPressure.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef SDF_AIRPRESSURE_HH_
#define SDF_AIRPRESSURE_HH_

#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>

#include <sdf/Error.hh>
#include <sdf/Element.hh>
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Altimeter.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef SDF_ALTIMETER_HH_
#define SDF_ALTIMETER_HH_

#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>

#include <sdf/Error.hh>
#include <sdf/Element.hh>
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Atmosphere.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#ifndef SDF_ATMOSPHERE_HH_
#define SDF_ATMOSPHERE_HH_

#include <ignition/math/Temperature.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Temperature.hh>
#include <gz/utils/ImplPtr.hh>

#include "sdf/Element.hh"
#include "sdf/Types.hh"
Expand Down
6 changes: 3 additions & 3 deletions include/sdf/Box.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
#ifndef SDF_BOX_HH_
#define SDF_BOX_HH_

#include <ignition/math/Box.hh>
#include <ignition/math/Vector3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Box.hh>
#include <gz/math/Vector3.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/sdf_config.h>
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Camera.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#define SDF_CAMERA_HH_

#include <string>
#include <ignition/math/Pose3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>

#include <sdf/Error.hh>
#include <sdf/Element.hh>
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Capsule.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#ifndef SDF_CAPSULE_HH_
#define SDF_CAPSULE_HH_

#include <ignition/math/Capsule.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Capsule.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/sdf_config.h>
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Collision.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include <memory>
#include <string>
#include <ignition/math/Pose3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>
#include "sdf/Element.hh"
#include "sdf/SemanticPose.hh"
#include "sdf/Types.hh"
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Cylinder.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#ifndef SDF_CYLINDER_HH_
#define SDF_CYLINDER_HH_

#include <ignition/math/Cylinder.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Cylinder.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/sdf_config.h>
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Ellipsoid.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#ifndef SDF_ELLIPSOID_HH_
#define SDF_ELLIPSOID_HH_

#include <ignition/math/Ellipsoid.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Ellipsoid.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/sdf_config.h>
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Error.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <iostream>
#include <string>
#include <optional>
#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/sdf_config.h>
#include "sdf/system_util.hh"

Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Exception.hh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <sstream>
#include <string>

#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/sdf_config.h>
#include "sdf/system_util.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 @@ -21,7 +21,7 @@
#include <memory>
#include <string>

#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/sdf_config.h>
#include "sdf/system_util.hh"

Expand Down
2 changes: 1 addition & 1 deletion include/sdf/ForceTorque.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define SDF_FORCE_TORQUE_HH_

#include <string>
#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/Noise.hh>
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Frame.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include <memory>
#include <string>
#include <ignition/math/Pose3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>
#include "sdf/Element.hh"
#include "sdf/SemanticPose.hh"
#include "sdf/Types.hh"
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Geometry.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef SDF_GEOMETRY_HH_
#define SDF_GEOMETRY_HH_

#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/sdf_config.h>
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Gui.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef SDF_GUI_HH_
#define SDF_GUI_HH_

#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>
#include "sdf/Element.hh"
#include "sdf/Plugin.hh"
#include "sdf/Types.hh"
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Heightmap.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#define SDF_HEIGHTMAP_HH_

#include <string>
#include <ignition/math/Vector3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Vector3.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/Element.hh>
#include <sdf/Error.hh>
#include <sdf/sdf_config.h>
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Imu.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define SDF_IMU_HH_

#include <string>
#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/Noise.hh>
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/InterfaceElements.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <string>
#include <memory>

#include <ignition/math/Pose3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>

#include "sdf/Element.hh"
#include "sdf/InterfaceModel.hh"
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/InterfaceFrame.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

#include <string>

#include <ignition/math/Pose3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>

#include "sdf/sdf_config.h"
#include "sdf/system_util.hh"
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/InterfaceJoint.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

#include <string>

#include <ignition/math/Pose3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>

#include "sdf/sdf_config.h"
#include "sdf/system_util.hh"
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/InterfaceLink.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

#include <string>

#include <ignition/math/Pose3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>

#include "sdf/sdf_config.h"
#include "sdf/system_util.hh"
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/InterfaceModel.hh
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <memory>
#include <vector>

#include <ignition/math/Pose3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>

#include "sdf/InterfaceFrame.hh"
#include "sdf/InterfaceJoint.hh"
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/InterfaceModelPoseGraph.hh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include <memory>
#include <vector>

#include <ignition/math/Pose3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>

#include "sdf/Types.hh"

Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Joint.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include <memory>
#include <string>
#include <ignition/math/Pose3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>
#include "sdf/Element.hh"
#include "sdf/SemanticPose.hh"
#include "sdf/Types.hh"
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/JointAxis.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include <memory>
#include <string>
#include <ignition/math/Vector3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Vector3.hh>
#include <gz/utils/ImplPtr.hh>
#include "sdf/Element.hh"
#include "sdf/Exception.hh"
#include "sdf/Types.hh"
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Lidar.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#ifndef SDF_LIDAR_HH_
#define SDF_LIDAR_HH_

#include <ignition/math/Angle.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Angle.hh>
#include <gz/utils/ImplPtr.hh>

#include <sdf/Error.hh>
#include <sdf/Element.hh>
Expand Down
6 changes: 3 additions & 3 deletions include/sdf/Light.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

#include <memory>
#include <string>
#include <ignition/math/Pose3.hh>
#include <ignition/math/Angle.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Pose3.hh>
#include <gz/math/Angle.hh>
#include <gz/utils/ImplPtr.hh>

#include "sdf/Element.hh"
#include "sdf/SemanticPose.hh"
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Link.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include <memory>
#include <string>
#include <ignition/math/Pose3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>
#include "sdf/Element.hh"
#include "sdf/SemanticPose.hh"
#include "sdf/Types.hh"
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Magnetometer.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef SDF_MAGNETOMETER_HH_
#define SDF_MAGNETOMETER_HH_

#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/Noise.hh>
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Material.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define SDF_MATERIAL_HH_

#include <string>
#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>
#include "sdf/Element.hh"
#include "sdf/Types.hh"
#include "sdf/sdf_config.h"
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Mesh.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#define SDF_MESH_HH_

#include <string>
#include <ignition/math/Vector3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Vector3.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/Element.hh>
#include <sdf/Error.hh>
#include <sdf/sdf_config.h>
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Model.hh
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include <string>
#include <utility>
#include <vector>
#include <ignition/math/Pose3.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>
#include "sdf/Element.hh"
#include "sdf/OutputConfig.hh"
#include "sdf/ParserConfig.hh"
Expand Down
4 changes: 2 additions & 2 deletions include/sdf/NavSat.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
#ifndef SDF_NAVSAT_HH_
#define SDF_NAVSAT_HH_

#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/Noise.hh>
#include <sdf/sdf_config.h>

#include <ignition/math/Angle.hh>
#include <gz/math/Angle.hh>

namespace sdf
{
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Noise.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef SDF_NOISE_HH_
#define SDF_NOISE_HH_

#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/sdf_config.h>
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/OutputConfig.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#ifndef SDF_OUTPUT_CONFIG_HH_
#define SDF_OUTPUT_CONFIG_HH_

#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>

#include "sdf/InterfaceElements.hh"
#include "sdf/sdf_config.h"
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Param.hh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <variant>
#include <vector>

#include <ignition/math.hh>
#include <gz/math.hh>

#include "sdf/Console.hh"
#include "sdf/PrintConfig.hh"
Expand Down
Loading