Skip to content

Commit

Permalink
Change sdf_config.h to sdf/config.hh everywhere
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Carroll <[email protected]>
  • Loading branch information
mjcarroll committed Nov 4, 2024
1 parent 22684cb commit fe7da56
Show file tree
Hide file tree
Showing 84 changed files with 97 additions and 86 deletions.
2 changes: 1 addition & 1 deletion include/sdf/Actor.hh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "sdf/Link.hh"
#include "sdf/Joint.hh"
#include "sdf/Plugin.hh"
#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/AirPressure.hh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/Noise.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>

namespace sdf
{
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/AirSpeed.hh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/Noise.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>

namespace sdf
{
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Altimeter.hh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/Noise.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>

namespace sdf
{
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Atmosphere.hh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include "sdf/Element.hh"
#include "sdf/Types.hh"
#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"


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

namespace sdf
{
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Camera.hh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/Noise.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>

namespace sdf
{
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Capsule.hh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <gz/utils/ImplPtr.hh>
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>

namespace sdf
{
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Collision.hh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "sdf/Element.hh"
#include "sdf/SemanticPose.hh"
#include "sdf/Types.hh"
#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"
#include "sdf/ParserConfig.hh"

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

namespace sdf
{
Expand Down
17 changes: 14 additions & 3 deletions include/sdf/Console.hh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <memory>
#include <string>

#include <sdf/sdf_config.h>
#include <sdf/config.hh>
#include "sdf/system_util.hh"

#ifdef _WIN32
Expand Down Expand Up @@ -192,10 +192,21 @@ namespace sdf

return *this;
}
}
} // namespace SDF_VERSION_NAMESPACE

/// \brief Internal namespace. Functions and classes defined in this namespace
/// are for internal use only and maybe removed without a deprecation cycle.
namespace internal
{
/// \brief Prints the error to _out or throw using SDF_ASSERT depending on the
/// ErrorCode in _error.
/// \param[out] _out ostream to use for printing errors.
/// \param[in] _error _error The error object to be printed
void SDFORMAT_VISIBLE throwOrPrintError(sdf::Console::ConsoleStream &_out,
const sdf::Error &_error);
} // namespace internal
/// \}
}
} // namepsace sdf

#ifdef _WIN32
#pragma warning(pop)
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Cylinder.hh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <gz/utils/ImplPtr.hh>
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>

namespace sdf
{
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Element.hh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "sdf/Error.hh"
#include "sdf/Param.hh"
#include "sdf/PrintConfig.hh"
#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"
#include "sdf/Types.hh"

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

namespace sdf
{
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Error.hh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <string>
#include <optional>
#include <gz/utils/ImplPtr.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>
#include "sdf/Console.hh"
#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 @@ -25,7 +25,7 @@
#include <string>

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

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

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

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/ForceTorque.hh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/Noise.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>

namespace sdf
{
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Frame.hh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "sdf/Element.hh"
#include "sdf/SemanticPose.hh"
#include "sdf/Types.hh"
#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Geometry.hh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <gz/math/Inertial.hh>
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>
#include <sdf/ParserConfig.hh>
#include <sdf/Types.hh>

Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Gui.hh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "sdf/Element.hh"
#include "sdf/Plugin.hh"
#include "sdf/Types.hh"
#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Heightmap.hh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <gz/utils/ImplPtr.hh>
#include <sdf/Element.hh>
#include <sdf/Error.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>

namespace sdf
{
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Imu.hh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/Noise.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>

namespace sdf
{
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/InstallationDirectories.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <string>

#include <sdf/sdf_config.h>
#include <sdf/config.hh>
#include <sdf/system_util.hh>

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/InterfaceElements.hh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "sdf/InterfaceModel.hh"
#include "sdf/Types.hh"

#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/InterfaceFrame.hh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>

#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/InterfaceJoint.hh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>

#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/InterfaceLink.hh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <gz/math/Pose3.hh>
#include <gz/utils/ImplPtr.hh>

#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/InterfaceModel.hh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "sdf/InterfaceModelPoseGraph.hh"
#include "sdf/Types.hh"

#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/InterfaceModelPoseGraph.hh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include "sdf/Types.hh"

#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Joint.hh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "sdf/Element.hh"
#include "sdf/SemanticPose.hh"
#include "sdf/Types.hh"
#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/JointAxis.hh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "sdf/Element.hh"
#include "sdf/Exception.hh"
#include "sdf/Types.hh"
#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Lidar.hh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/Noise.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>


namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Light.hh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "sdf/Element.hh"
#include "sdf/SemanticPose.hh"
#include "sdf/Types.hh"
#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Link.hh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "sdf/Element.hh"
#include "sdf/SemanticPose.hh"
#include "sdf/Types.hh"
#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"
#include "sdf/ParserConfig.hh"
#include "sdf/Error.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 @@ -21,7 +21,7 @@
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/Noise.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>

namespace sdf
{
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Material.hh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <gz/utils/ImplPtr.hh>
#include "sdf/Element.hh"
#include "sdf/Types.hh"
#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Mesh.hh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <sdf/CustomInertiaCalcProperties.hh>
#include <sdf/Element.hh>
#include <sdf/Error.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>

namespace sdf
{
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/Model.hh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "sdf/Plugin.hh"
#include "sdf/SemanticPose.hh"
#include "sdf/Types.hh"
#include "sdf/sdf_config.h"
#include "sdf/config.hh"
#include "sdf/system_util.hh"

namespace sdf
Expand Down
2 changes: 1 addition & 1 deletion include/sdf/NavSat.hh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <sdf/Error.hh>
#include <sdf/Element.hh>
#include <sdf/Noise.hh>
#include <sdf/sdf_config.h>
#include <sdf/config.hh>

#include <gz/math/Angle.hh>

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

namespace sdf
{
Expand Down
Loading

0 comments on commit fe7da56

Please sign in to comment.