Skip to content

Remove deprecations for main/gz-sim8 #1783

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

Merged
merged 6 commits into from
Dec 8, 2022
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 0 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -263,13 +263,3 @@ endif()
if(TARGET doc)
file(COPY ${CMAKE_SOURCE_DIR}/tutorials/files/ DESTINATION ${CMAKE_BINARY_DIR}/doxygen/html/files/)
endif()

# TICKTOCK MASTER HEADER (to bypass GZ_DESIGNATION)
# TODO(CH3): Deprecated. Remove on tock
configure_file(
${CMAKE_CURRENT_BINARY_DIR}/include/gz/${GZ_DESIGNATION}.hh
${CMAKE_CURRENT_BINARY_DIR}/include/gz/sim.hh
COPYONLY)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/include/gz/sim.hh
DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}/gz)
1 change: 0 additions & 1 deletion include/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
add_subdirectory(gz)
install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL})
5 changes: 0 additions & 5 deletions include/gz/sim/Util.hh
Original file line number Diff line number Diff line change
Expand Up @@ -301,11 +301,6 @@ namespace gz
/// \brief Environment variable holding paths to custom rendering engine
/// plugins.
const std::string kRenderPluginPathEnv{"GZ_SIM_RENDER_ENGINE_PATH"};

// TODO(CH3): Deprecated. Remove on tock.
const std::string kResourcePathEnvDeprecated{"IGN_GAZEBO_RESOURCE_PATH"};
const std::string kRenderPluginPathEnvDeprecated{
"IGN_GAZEBO_RENDER_ENGINE_PATH"};
}
}
}
Expand Down
8 changes: 2 additions & 6 deletions include/gz/sim/comms/MsgManager.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#ifndef GZ_SIM_MSGMANAGER_HH_
#define GZ_SIM_MSGMANAGER_HH_

#include <gz/msgs/dataframe.pb.h>

#include <deque>
#include <memory>
#include <string>
Expand All @@ -31,18 +33,12 @@

namespace gz
{
namespace msgs
{
// Forward declarations.
class Dataframe;
}
namespace sim
{
// Inline bracket to help doxygen filtering.
inline namespace GZ_SIM_VERSION_NAMESPACE {
namespace comms
{

/// \brief A queue of message pointers.
using DataQueue = std::deque<msgs::DataframeSharedPtr>;

Expand Down
1 change: 1 addition & 0 deletions include/gz/sim/rendering/SceneManager.hh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include <gz/math/Inertial.hh>
#include <gz/math/Matrix4.hh>
#include <gz/math/Pose3.hh>
#include <gz/math/SphericalCoordinates.hh>
#include <gz/math/Vector3.hh>

#include <gz/msgs/particle_emitter.pb.h>
Expand Down
18 changes: 0 additions & 18 deletions include/ignition/gazebo.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/Conversions.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/Entity.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/EntityComponentManager.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/EventManager.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/Events.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/Export.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/Link.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/Model.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/Primitives.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/SdfEntityCreator.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/Server.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/ServerConfig.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/System.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/SystemLoader.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/gazebo/SystemPluginPtr.hh

This file was deleted.

Loading