Skip to content

Commit

Permalink
Avoid symbol redefition to fix armel builds
Browse files Browse the repository at this point in the history
  • Loading branch information
j-rivero committed Oct 7, 2021
1 parent 19e1843 commit 6e25442
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 27 deletions.
10 changes: 0 additions & 10 deletions include/ignition/rendering/Storage.hh
Expand Up @@ -294,16 +294,6 @@ namespace ignition
public: virtual ~StoreWrapper() { }
};

template class Store<Scene>;
template class Store<Node>;
template class Store<Light>;
template class Store<Sensor>;
template class Store<Visual>;
template class Store<Geometry>;
template class Store<SubMesh>;
template class Map<Material>;
template class CompositeStore<Node>;

/// \def SceneStore
/// \brief Store of Scene
typedef Store<Scene> SceneStore;
Expand Down
9 changes: 0 additions & 9 deletions ogre/include/ignition/rendering/ogre/OgreStorage.hh
Expand Up @@ -34,15 +34,6 @@ namespace ignition
namespace rendering
{
inline namespace IGNITION_RENDERING_VERSION_NAMESPACE {
//
template class BaseSceneStore<OgreScene>;
template class BaseNodeStore<OgreNode>;
template class BaseLightStore<OgreLight>;
template class BaseSensorStore<OgreSensor>;
template class BaseVisualStore<OgreVisual>;
template class BaseGeometryStore<OgreGeometry>;
template class BaseSubMeshStore<OgreSubMesh>;
template class BaseMaterialMap<OgreMaterial>;

typedef BaseSceneStore<OgreScene> OgreSceneStore;
typedef BaseNodeStore<OgreNode> OgreNodeStore;
Expand Down
8 changes: 0 additions & 8 deletions ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh
Expand Up @@ -33,14 +33,6 @@ namespace ignition
namespace rendering
{
inline namespace IGNITION_RENDERING_VERSION_NAMESPACE {
//
template class BaseGeometryStore<Ogre2Geometry>;
template class BaseLightStore<Ogre2Light>;
template class BaseNodeStore<Ogre2Node>;
template class BaseSceneStore<Ogre2Scene>;
template class BaseSensorStore<Ogre2Sensor>;
template class BaseSubMeshStore<Ogre2SubMesh>;
template class BaseVisualStore<Ogre2Visual>;

typedef BaseGeometryStore<Ogre2Geometry> Ogre2GeometryStore;
typedef BaseLightStore<Ogre2Light> Ogre2LightStore;
Expand Down

0 comments on commit 6e25442

Please sign in to comment.