Skip to content

Commit

Permalink
Remove visibility from templated class and methods
Browse files Browse the repository at this point in the history
Signed-off-by: Jose Luis Rivero <[email protected]>
  • Loading branch information
j-rivero committed Aug 12, 2021
1 parent d9a49e6 commit 772a5f8
Showing 1 changed file with 1 addition and 22 deletions.
23 changes: 1 addition & 22 deletions include/ignition/gazebo/detail/View.hh
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,6 @@
#include "ignition/gazebo/config.hh"
#include "ignition/gazebo/detail/BaseView.hh"

// TODO(chapulina) Remove hardcoded 6
#ifndef _WIN32
# define ignition_gazebo_EXPORTS_API
#else
# if (defined(ignition_gazebo6_EXPORTS))
# define ignition_gazebo_EXPORTS_API __declspec(dllexport)
# else
# define ignition_gazebo_EXPORTS_API __declspec(dllimport)
# endif
#endif

namespace ignition
{
namespace gazebo
Expand All @@ -50,7 +39,7 @@ namespace detail
/// \brief A view that caches a particular set of component type data.
/// \tparam ComponentTypeTs The component type(s) that are stored in this view.
template<typename ...ComponentTypeTs>
class ignition_gazebo_EXPORTS_API View : public BaseView
class View : public BaseView
{
/// \brief Alias for containers that hold and entity and its component data.
/// The component types held in this container match the component types that
Expand Down Expand Up @@ -158,15 +147,13 @@ class ignition_gazebo_EXPORTS_API View : public BaseView

//////////////////////////////////////////////////
template<typename ...ComponentTypeTs>
ignition_gazebo_EXPORTS_API
View<ComponentTypeTs...>::View()
{
this->componentTypes = {ComponentTypeTs::typeId...};
}

//////////////////////////////////////////////////
template<typename ...ComponentTypeTs>
ignition_gazebo_EXPORTS_API
bool View<ComponentTypeTs...>::HasCachedComponentData(
const Entity _entity) const
{
Expand All @@ -193,7 +180,6 @@ bool View<ComponentTypeTs...>::HasCachedComponentData(

//////////////////////////////////////////////////
template<typename ...ComponentTypeTs>
ignition_gazebo_EXPORTS_API
bool View<ComponentTypeTs...>::RemoveEntity(const Entity _entity)
{
this->invalidData.erase(_entity);
Expand All @@ -215,7 +201,6 @@ bool View<ComponentTypeTs...>::RemoveEntity(const Entity _entity)

//////////////////////////////////////////////////
template<typename ...ComponentTypeTs>
ignition_gazebo_EXPORTS_API
typename View<ComponentTypeTs...>::ConstComponentData
View<ComponentTypeTs...>::EntityComponentConstData(const Entity _entity) const
{
Expand All @@ -224,7 +209,6 @@ typename View<ComponentTypeTs...>::ConstComponentData

//////////////////////////////////////////////////
template<typename ...ComponentTypeTs>
ignition_gazebo_EXPORTS_API
typename View<ComponentTypeTs...>::ComponentData
View<ComponentTypeTs...>::EntityComponentData(const Entity _entity)
{
Expand All @@ -233,7 +217,6 @@ typename View<ComponentTypeTs...>::ComponentData

//////////////////////////////////////////////////
template<typename ...ComponentTypeTs>
ignition_gazebo_EXPORTS_API
void View<ComponentTypeTs...>::AddEntityWithConstComps(const Entity &_entity,
const bool _new, const ComponentTypeTs*... _compPtrs)
{
Expand All @@ -245,7 +228,6 @@ void View<ComponentTypeTs...>::AddEntityWithConstComps(const Entity &_entity,

//////////////////////////////////////////////////
template<typename ...ComponentTypeTs>
ignition_gazebo_EXPORTS_API
void View<ComponentTypeTs...>::AddEntityWithComps(const Entity &_entity,
const bool _new, ComponentTypeTs*... _compPtrs)
{
Expand All @@ -257,7 +239,6 @@ void View<ComponentTypeTs...>::AddEntityWithComps(const Entity &_entity,

//////////////////////////////////////////////////
template<typename ...ComponentTypeTs>
ignition_gazebo_EXPORTS_API
bool View<ComponentTypeTs...>::NotifyComponentAddition(const Entity _entity,
bool _newEntity, const ComponentTypeId _typeId)
{
Expand Down Expand Up @@ -296,7 +277,6 @@ bool View<ComponentTypeTs...>::NotifyComponentAddition(const Entity _entity,

//////////////////////////////////////////////////
template<typename ...ComponentTypeTs>
ignition_gazebo_EXPORTS_API
bool View<ComponentTypeTs...>::NotifyComponentRemoval(const Entity _entity,
const ComponentTypeId _typeId)
{
Expand Down Expand Up @@ -329,7 +309,6 @@ bool View<ComponentTypeTs...>::NotifyComponentRemoval(const Entity _entity,

//////////////////////////////////////////////////
template<typename ...ComponentTypeTs>
ignition_gazebo_EXPORTS_API
void View<ComponentTypeTs...>::Reset()
{
// reset all data structures in the BaseView except for componentTypes since
Expand Down

0 comments on commit 772a5f8

Please sign in to comment.