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.

Sign up for GitHub

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

Jump to bottom

Convert remaining #include statements to use gz/ #427

Merged
merged 10 commits into from
May 10, 2022
Merged

Convert remaining #include statements to use gz/ #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a25d360
Use #include <gz/*> in include/*
scpeters May 9, 2022
ffb88af
Use #include <gz/*> in src/python_pybind11/*
scpeters May 9, 2022
5724c23
Use #include <gz/*> in src/ruby/*
scpeters May 9, 2022
ebd0def
Use #include <gz/*> in eigen3/*
scpeters May 9, 2022
d6bb50e
Use #include <gz/*> in src/*_TEST.cc
scpeters May 9, 2022
745d7de
Use #include <gz/*> in src/*.cc
scpeters May 9, 2022
2a23849
Use #include <gz/*> in src/graph/*
scpeters May 9, 2022
770cbe0
Use #include <gz/*> in src/*.hh
scpeters May 9, 2022
edcea00
Use #include <gz/*> in tutorials/
scpeters May 9, 2022
3ffff69
Use #include <gz/*> in src/*.i
scpeters May 9, 2022
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
2 changes: 1 addition & 1 deletion eigen3/src/Conversions_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <gtest/gtest.h>

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

/////////////////////////////////////////////////
/// Check Vector3 conversions
Expand Down
2 changes: 1 addition & 1 deletion eigen3/src/Util_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <gtest/gtest.h>

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

using namespace ignition;

Expand Down
6 changes: 3 additions & 3 deletions include/gz/math/VolumetricGridLookupField.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
#include <vector>
#include <optional>

#include <ignition/math/Vector3.hh>
#include <ignition/math/detail/InterpolationPoint.hh>
#include <gz/math/Vector3.hh>
#include <gz/math/detail/InterpolationPoint.hh>

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

namespace ignition
{
Expand Down
2 changes: 1 addition & 1 deletion include/gz/math/detail/AxisIndex.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include <cassert>

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

namespace ignition
{
Expand Down
4 changes: 2 additions & 2 deletions include/gz/math/detail/InterpolationPoint.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#ifndef IGNITION_MATH_INTERPOLATION_POINT_HH_
#define IGNITION_MATH_INTERPOLATION_POINT_HH_

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

#include <optional>
#include <vector>
Expand Down
4 changes: 2 additions & 2 deletions src/AdditivelySeparableScalarField3_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include <functional>
#include <ostream>

#include "ignition/math/AdditivelySeparableScalarField3.hh"
#include "ignition/math/Polynomial3.hh"
#include "gz/math/AdditivelySeparableScalarField3.hh"
#include "gz/math/Polynomial3.hh"

using namespace ignition;

Expand Down
4 changes: 2 additions & 2 deletions src/Angle.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*
*/
#include "ignition/math/Helpers.hh"
#include "ignition/math/Angle.hh"
#include "gz/math/Helpers.hh"
#include "gz/math/Angle.hh"

using namespace ignition::math;

Expand Down
4 changes: 2 additions & 2 deletions src/Angle_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include <cmath>

#include "ignition/math/Helpers.hh"
#include "ignition/math/Angle.hh"
#include "gz/math/Helpers.hh"
#include "gz/math/Angle.hh"

using namespace ignition;

Expand Down
2 changes: 1 addition & 1 deletion src/AxisAlignedBox.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/
#include <cmath>
#include <ignition/math/AxisAlignedBox.hh>
#include <gz/math/AxisAlignedBox.hh>

using namespace ignition;
using namespace math;
Expand Down
2 changes: 1 addition & 1 deletion src/AxisAlignedBox_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <gtest/gtest.h>
#include <cmath>

#include "ignition/math/AxisAlignedBox.hh"
#include "gz/math/AxisAlignedBox.hh"

using namespace ignition;
using namespace math;
Expand Down
2 changes: 1 addition & 1 deletion src/Box_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <gtest/gtest.h>
#include <cmath>

#include "ignition/math/Box.hh"
#include "gz/math/Box.hh"

using namespace ignition;

Expand Down
4 changes: 2 additions & 2 deletions src/Capsule_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include <cmath>
#include <iostream>

#include "ignition/math/Capsule.hh"
#include "ignition/math/Helpers.hh"
#include "gz/math/Capsule.hh"
#include "gz/math/Helpers.hh"

using namespace ignition;

Expand Down
2 changes: 1 addition & 1 deletion src/Color.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <cmath>
#include <algorithm>

#include "ignition/math/Color.hh"
#include "gz/math/Color.hh"

using namespace ignition;
using namespace math;
Expand Down
2 changes: 1 addition & 1 deletion src/Color_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <gtest/gtest.h>
#include <cmath>
#include <ignition/math/Color.hh>
#include <gz/math/Color.hh>

using namespace ignition;

Expand Down
2 changes: 1 addition & 1 deletion src/Cylinder_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <cmath>
#include <iostream>

#include "ignition/math/Cylinder.hh"
#include "gz/math/Cylinder.hh"

using namespace ignition;

Expand Down
4 changes: 2 additions & 2 deletions src/DiffDriveOdometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*
*/
#include <cmath>
#include "ignition/math/DiffDriveOdometry.hh"
#include "ignition/math/RollingMean.hh"
#include "gz/math/DiffDriveOdometry.hh"
#include "gz/math/RollingMean.hh"

using namespace ignition;
using namespace math;
Expand Down
6 changes: 3 additions & 3 deletions src/DiffDriveOdometry_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#include <gtest/gtest.h>
#include <thread>

#include "ignition/math/Angle.hh"
#include "ignition/math/Helpers.hh"
#include "ignition/math/DiffDriveOdometry.hh"
#include "gz/math/Angle.hh"
#include "gz/math/Helpers.hh"
#include "gz/math/DiffDriveOdometry.hh"

using namespace ignition;

Expand Down
6 changes: 3 additions & 3 deletions src/Ellipsoid_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#include <cmath>
#include <iostream>

#include "ignition/math/Ellipsoid.hh"
#include "ignition/math/Helpers.hh"
#include "ignition/math/Vector3.hh"
#include "gz/math/Ellipsoid.hh"
#include "gz/math/Helpers.hh"
#include "gz/math/Vector3.hh"

using namespace ignition;

Expand Down
2 changes: 1 addition & 1 deletion src/Filter_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <gtest/gtest.h>

#include "ignition/math/Filter.hh"
#include "gz/math/Filter.hh"

using namespace ignition;

Expand Down
12 changes: 6 additions & 6 deletions src/Frustum.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
#include <array>
#include <utility>

#include "ignition/math/Angle.hh"
#include "ignition/math/AxisAlignedBox.hh"
#include "ignition/math/Frustum.hh"
#include "ignition/math/Matrix4.hh"
#include "ignition/math/Plane.hh"
#include "ignition/math/Pose3.hh"
#include "gz/math/Angle.hh"
#include "gz/math/AxisAlignedBox.hh"
#include "gz/math/Frustum.hh"
#include "gz/math/Matrix4.hh"
#include "gz/math/Plane.hh"
#include "gz/math/Pose3.hh"

using namespace ignition;
using namespace math;
Expand Down
4 changes: 2 additions & 2 deletions src/Frustum_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#include <gtest/gtest.h>

#include "ignition/math/Helpers.hh"
#include "ignition/math/Frustum.hh"
#include "gz/math/Helpers.hh"
#include "gz/math/Frustum.hh"

using namespace ignition;
using namespace math;
Expand Down
4 changes: 2 additions & 2 deletions src/GaussMarkovProcess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*
*/

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

using namespace ignition::math;

Expand Down
6 changes: 3 additions & 3 deletions src/GaussMarkovProcess_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

#include <gtest/gtest.h>

#include "ignition/math/GaussMarkovProcess.hh"
#include "ignition/math/Helpers.hh"
#include "ignition/math/Rand.hh"
#include "gz/math/GaussMarkovProcess.hh"
#include "gz/math/Helpers.hh"
#include "gz/math/Rand.hh"

using namespace ignition;
using namespace math;
Expand Down
2 changes: 1 addition & 1 deletion src/Helpers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*
*/
#include "ignition/math/Helpers.hh"
#include "gz/math/Helpers.hh"

#include <iomanip>
#include <regex>
Expand Down
2 changes: 1 addition & 1 deletion src/Helpers.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

%module helpers
%{
#include <ignition/math/Helpers.hh>
#include <gz/math/Helpers.hh>
%}

template <typename T>
Expand Down
8 changes: 4 additions & 4 deletions src/Helpers_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
#include <cmath>
#include <limits>

#include "ignition/math/Rand.hh"
#include "ignition/math/Vector3.hh"
#include "ignition/math/Helpers.hh"
#include <ignition/utils/SuppressWarning.hh>
#include "gz/math/Rand.hh"
#include "gz/math/Vector3.hh"
#include "gz/math/Helpers.hh"
#include <gz/utils/SuppressWarning.hh>

using namespace ignition;

Expand Down
2 changes: 1 addition & 1 deletion src/Inertial_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <gtest/gtest.h>
#include <cmath>

#include "ignition/math/Inertial.hh"
#include "gz/math/Inertial.hh"

using namespace ignition;

Expand Down
2 changes: 1 addition & 1 deletion src/Interval_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <gtest/gtest.h>
#include <ostream>

#include "ignition/math/Interval.hh"
#include "gz/math/Interval.hh"

using namespace ignition;

Expand Down
4 changes: 2 additions & 2 deletions src/Kmeans.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
*
*/

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

#include <iostream>

#include <ignition/math/Rand.hh>
#include <gz/math/Rand.hh>
#include "KmeansPrivate.hh"

using namespace ignition;
Expand Down
6 changes: 3 additions & 3 deletions src/KmeansPrivate.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#define IGNITION_MATH_KMEANSPRIVATE_HH_

#include <vector>
#include <ignition/math/Vector3.hh>
#include <ignition/math/Helpers.hh>
#include <ignition/math/config.hh>
#include <gz/math/Vector3.hh>
#include <gz/math/Helpers.hh>
#include <gz/math/config.hh>

namespace ignition
{
Expand Down
2 changes: 1 addition & 1 deletion src/Kmeans_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <gtest/gtest.h>
#include <vector>
#include "ignition/math/Kmeans.hh"
#include "gz/math/Kmeans.hh"

using namespace ignition;

Expand Down
4 changes: 2 additions & 2 deletions src/Line2_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#include <gtest/gtest.h>

#include "ignition/math/Line2.hh"
#include "ignition/math/Helpers.hh"
#include "gz/math/Line2.hh"
#include "gz/math/Helpers.hh"

using namespace ignition;

Expand Down
4 changes: 2 additions & 2 deletions src/Line3_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#include <gtest/gtest.h>

#include "ignition/math/Line3.hh"
#include "ignition/math/Helpers.hh"
#include "gz/math/Line3.hh"
#include "gz/math/Helpers.hh"

using namespace ignition;

Expand Down
6 changes: 3 additions & 3 deletions src/MassMatrix3_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#include <gtest/gtest.h>
#include <cmath>

#include "ignition/math/Helpers.hh"
#include "ignition/math/MassMatrix3.hh"
#include "ignition/math/Material.hh"
#include "gz/math/Helpers.hh"
#include "gz/math/MassMatrix3.hh"
#include "gz/math/Material.hh"

using namespace ignition;

Expand Down
4 changes: 2 additions & 2 deletions src/Material.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*
*/

#include "ignition/math/Material.hh"
#include "gz/math/Material.hh"

#include <algorithm>
#include <memory>

#include "ignition/math/Helpers.hh"
#include "gz/math/Helpers.hh"

// Placing the kMaterialData in a separate file for conveniece and clarity.
#include "MaterialType.hh"
Expand Down
6 changes: 3 additions & 3 deletions src/Material_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
*/

#include <gtest/gtest.h>
#include "ignition/math/Material.hh"
#include "ignition/math/MaterialType.hh"
#include "ignition/math/Helpers.hh"
#include "gz/math/Material.hh"
#include "gz/math/MaterialType.hh"
#include "gz/math/Helpers.hh"

using namespace ignition;
using namespace math;
Expand Down
Loading