From 6e2544259a3a91d9904af70d6197fbb8fa03d308 Mon Sep 17 00:00:00 2001
From: Jose Luis Rivero <jrivero@osrfoundation.org>
Date: Thu, 7 Oct 2021 23:07:28 +0200
Subject: [PATCH] Avoid symbol redefition to fix armel builds

---
 include/ignition/rendering/Storage.hh                  | 10 ----------
 ogre/include/ignition/rendering/ogre/OgreStorage.hh    |  9 ---------
 ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh |  8 --------
 3 files changed, 27 deletions(-)

diff --git a/include/ignition/rendering/Storage.hh b/include/ignition/rendering/Storage.hh
index 82f741045..abb6a54b6 100644
--- a/include/ignition/rendering/Storage.hh
+++ b/include/ignition/rendering/Storage.hh
@@ -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;
diff --git a/ogre/include/ignition/rendering/ogre/OgreStorage.hh b/ogre/include/ignition/rendering/ogre/OgreStorage.hh
index b0468277f..5435168b2 100644
--- a/ogre/include/ignition/rendering/ogre/OgreStorage.hh
+++ b/ogre/include/ignition/rendering/ogre/OgreStorage.hh
@@ -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;
diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh
index b37291179..6ab600026 100644
--- a/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh
+++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh
@@ -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;