diff --git a/include/ignition/gazebo/detail/View.hh b/include/ignition/gazebo/detail/View.hh index 13abccbcf8..93ea32c1b1 100644 --- a/include/ignition/gazebo/detail/View.hh +++ b/include/ignition/gazebo/detail/View.hh @@ -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 @@ -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 -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 @@ -158,7 +147,6 @@ class ignition_gazebo_EXPORTS_API View : public BaseView ////////////////////////////////////////////////// template -ignition_gazebo_EXPORTS_API View::View() { this->componentTypes = {ComponentTypeTs::typeId...}; @@ -166,7 +154,6 @@ View::View() ////////////////////////////////////////////////// template -ignition_gazebo_EXPORTS_API bool View::HasCachedComponentData( const Entity _entity) const { @@ -193,7 +180,6 @@ bool View::HasCachedComponentData( ////////////////////////////////////////////////// template -ignition_gazebo_EXPORTS_API bool View::RemoveEntity(const Entity _entity) { this->invalidData.erase(_entity); @@ -215,7 +201,6 @@ bool View::RemoveEntity(const Entity _entity) ////////////////////////////////////////////////// template -ignition_gazebo_EXPORTS_API typename View::ConstComponentData View::EntityComponentConstData(const Entity _entity) const { @@ -224,7 +209,6 @@ typename View::ConstComponentData ////////////////////////////////////////////////// template -ignition_gazebo_EXPORTS_API typename View::ComponentData View::EntityComponentData(const Entity _entity) { @@ -233,7 +217,6 @@ typename View::ComponentData ////////////////////////////////////////////////// template -ignition_gazebo_EXPORTS_API void View::AddEntityWithConstComps(const Entity &_entity, const bool _new, const ComponentTypeTs*... _compPtrs) { @@ -245,7 +228,6 @@ void View::AddEntityWithConstComps(const Entity &_entity, ////////////////////////////////////////////////// template -ignition_gazebo_EXPORTS_API void View::AddEntityWithComps(const Entity &_entity, const bool _new, ComponentTypeTs*... _compPtrs) { @@ -257,7 +239,6 @@ void View::AddEntityWithComps(const Entity &_entity, ////////////////////////////////////////////////// template -ignition_gazebo_EXPORTS_API bool View::NotifyComponentAddition(const Entity _entity, bool _newEntity, const ComponentTypeId _typeId) { @@ -296,7 +277,6 @@ bool View::NotifyComponentAddition(const Entity _entity, ////////////////////////////////////////////////// template -ignition_gazebo_EXPORTS_API bool View::NotifyComponentRemoval(const Entity _entity, const ComponentTypeId _typeId) { @@ -329,7 +309,6 @@ bool View::NotifyComponentRemoval(const Entity _entity, ////////////////////////////////////////////////// template -ignition_gazebo_EXPORTS_API void View::Reset() { // reset all data structures in the BaseView except for componentTypes since