From 64c5e4a64947f27f2075396b95d77837880f9f88 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 7 Oct 2021 23:07:28 +0200 Subject: [PATCH 1/5] Avoid symbol redefition to fix armel builds Signed-off-by: Jose Luis Rivero --- 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; - template class Store; - template class Store; - template class Store; - template class Store; - template class Store; - template class Store; - template class Map; - template class CompositeStore; - /// \def SceneStore /// \brief Store of Scene typedef Store 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; - template class BaseNodeStore; - template class BaseLightStore; - template class BaseSensorStore; - template class BaseVisualStore; - template class BaseGeometryStore; - template class BaseSubMeshStore; - template class BaseMaterialMap; typedef BaseSceneStore OgreSceneStore; typedef BaseNodeStore 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; - template class BaseLightStore; - template class BaseNodeStore; - template class BaseSceneStore; - template class BaseSensorStore; - template class BaseSubMeshStore; - template class BaseVisualStore; typedef BaseGeometryStore Ogre2GeometryStore; typedef BaseLightStore Ogre2LightStore; From 43daae1614124db1c0d2ed244505588096bd2112 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 11 Oct 2021 19:06:27 +0200 Subject: [PATCH 2/5] Fix compilation against Ogre 1.10.12 (#390) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: GitHub Co-authored-by: Alejandro Hernández Cordero Co-authored-by: Jose Luis Rivero Signed-off-by: Jose Luis Rivero --- ogre/src/CMakeLists.txt | 7 ++----- ogre/src/OgreGaussianNoisePass.cc | 4 ++-- ogre/src/OgreGpuRays.cc | 4 ++-- ogre/src/OgreMaterial.cc | 4 ++-- ogre/src/OgreMaterialSwitcher.cc | 2 +- ogre/src/OgreRTShaderSystem.cc | 14 +++++++------- ogre/src/OgreRenderEngine.cc | 4 ++-- ogre/src/OgreScene.cc | 2 +- ogre/src/OgreText.cc | 14 +++++++------- ogre/src/OgreThermalCamera.cc | 4 ++-- 10 files changed, 28 insertions(+), 31 deletions(-) diff --git a/ogre/src/CMakeLists.txt b/ogre/src/CMakeLists.txt index bb38fd8b6..2ea299b35 100644 --- a/ogre/src/CMakeLists.txt +++ b/ogre/src/CMakeLists.txt @@ -15,11 +15,8 @@ set(engine_name "ogre") ign_add_component(${engine_name} SOURCES ${sources} GET_TARGET_NAME ogre_target) -if(OGRE_VERSION VERSION_LESS 1.10.3) - add_definitions(-DOGRE_VERSION_LT_1_10_3) -endif() -if(OGRE_VERSION VERSION_LESS 1.10.1) - add_definitions(-DOGRE_VERSION_LT_1_10_1) +if(OGRE_VERSION VERSION_LESS 1.11.0) + add_definitions(-DOGRE_VERSION_LT_1_11_0) endif() if(OGRE_VERSION VERSION_LESS 1.12.0) add_definitions(-DOGRE_VERSION_LT_1_12_0) diff --git a/ogre/src/OgreGaussianNoisePass.cc b/ogre/src/OgreGaussianNoisePass.cc index 84a35e394..082c89f18 100644 --- a/ogre/src/OgreGaussianNoisePass.cc +++ b/ogre/src/OgreGaussianNoisePass.cc @@ -44,7 +44,7 @@ namespace ignition public: virtual void notifyMaterialRender(unsigned int _passId, Ogre::MaterialPtr &_mat) { -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 IGN_ASSERT(!_mat.isNull(), "Null OGRE material"); #else IGN_ASSERT(_mat, "Null OGRE material"); @@ -68,7 +68,7 @@ namespace ignition IGN_ASSERT(pass, "Null OGRE material pass"); Ogre::GpuProgramParametersSharedPtr params = pass->getFragmentProgramParameters(); -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 IGN_ASSERT(!params.isNull(), "Null OGRE material GPU parameters"); #else IGN_ASSERT(params, "Null OGRE material GPU parameters"); diff --git a/ogre/src/OgreGpuRays.cc b/ogre/src/OgreGpuRays.cc index 2dba203b6..2c1381557 100644 --- a/ogre/src/OgreGpuRays.cc +++ b/ogre/src/OgreGpuRays.cc @@ -409,7 +409,7 @@ void OgreGpuRays::CreateGpuRaysTextures() Ogre::TextureManager::getSingleton().createManual( texName.str(), "General", Ogre::TEX_TYPE_2D, this->dataPtr->w1st, this->dataPtr->h1st, 0, -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 Ogre::PF_FLOAT32_RGB, Ogre::TU_RENDERTARGET).getPointer(); #else Ogre::PF_FLOAT32_RGB, Ogre::TU_RENDERTARGET).get(); @@ -445,7 +445,7 @@ void OgreGpuRays::CreateGpuRaysTextures() Ogre::TEX_TYPE_2D, this->dataPtr->w2nd, this->dataPtr->h2nd, 0, Ogre::PF_FLOAT32_RGB, -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 Ogre::TU_RENDERTARGET).getPointer(); #else Ogre::TU_RENDERTARGET).get(); diff --git a/ogre/src/OgreMaterial.cc b/ogre/src/OgreMaterial.cc index bcce577bb..29eb8a821 100644 --- a/ogre/src/OgreMaterial.cc +++ b/ogre/src/OgreMaterial.cc @@ -46,7 +46,7 @@ void OgreMaterial::Destroy() return; Ogre::MaterialManager &matManager = Ogre::MaterialManager::getSingleton(); -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 if (!this->ogreMaterial.isNull()) { matManager.remove(this->ogreMaterial->getName()); @@ -526,7 +526,7 @@ Ogre::TexturePtr OgreMaterial::CreateTexture(const std::string &_name) if (image.getWidth() == 0) { - #if OGRE_VERSION_LT_1_10_1 + #if OGRE_VERSION_LT_1_11_0 texture.setNull(); #else texture.reset(); diff --git a/ogre/src/OgreMaterialSwitcher.cc b/ogre/src/OgreMaterialSwitcher.cc index dc1b024c3..a75fd1768 100644 --- a/ogre/src/OgreMaterialSwitcher.cc +++ b/ogre/src/OgreMaterialSwitcher.cc @@ -79,7 +79,7 @@ Ogre::Technique *OgreMaterialSwitcher::handleSchemeNotFound( Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); // OGRE 1.9 changes the shared pointer definition - #if OGRE_VERSION_LT_1_10_1 + #if OGRE_VERSION_LT_1_11_0 Ogre::MaterialPtr plainMaterial = res.staticCast(); #else Ogre::MaterialPtr plainMaterial = diff --git a/ogre/src/OgreRTShaderSystem.cc b/ogre/src/OgreRTShaderSystem.cc index 657cef175..4bf49bea1 100644 --- a/ogre/src/OgreRTShaderSystem.cc +++ b/ogre/src/OgreRTShaderSystem.cc @@ -81,7 +81,7 @@ OgreRTShaderSystem::OgreRTShaderSystem() { this->dataPtr->initialized = false; this->dataPtr->shadowsApplied = false; -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 this->dataPtr->pssmSetup.setNull(); #else this->dataPtr->pssmSetup.reset(); @@ -157,7 +157,7 @@ void OgreRTShaderSystem::Fini() #endif this->dataPtr->shaderGenerator = nullptr; } -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 this->dataPtr->pssmSetup.setNull(); #else this->dataPtr->pssmSetup.reset(); @@ -300,7 +300,7 @@ void OgreRTShaderSystem::RemoveShaders(OgreSubMesh *_subMesh) #ifdef OGRE_VERSION_LT_1_12_0 this->dataPtr->shaderGenerator->removeShaderBasedTechnique( curMaterialName, - #ifndef OGRE_VERSION_LT_1_10_3 + #ifndef OGRE_VERSION_LT_1_11_0 curSubEntity->getMaterial()->getGroup(), #endif Ogre::MaterialManager::DEFAULT_SCHEME_NAME, @@ -380,7 +380,7 @@ void OgreRTShaderSystem::GenerateShaders(OgreSubMesh *subMesh) try { success = this->dataPtr->shaderGenerator->createShaderBasedTechnique( -#if OGRE_VERSION_LT_1_10_3 +#if OGRE_VERSION_LT_1_11_0 curMaterialName, #else *material->Material(), @@ -407,7 +407,7 @@ void OgreRTShaderSystem::GenerateShaders(OgreSubMesh *subMesh) this->dataPtr->scenes[s]->Name() + Ogre::RTShader::ShaderGenerator::DEFAULT_SCHEME_NAME, curMaterialName, -#ifndef OGRE_VERSION_LT_1_10_3 +#ifndef OGRE_VERSION_LT_1_11_0 material->Material()->getGroup(), #endif 0); @@ -590,7 +590,7 @@ void OgreRTShaderSystem::ApplyShadows(OgreScenePtr _scene) sceneMgr->setShadowTextureSelfShadow(false); sceneMgr->setShadowCasterRenderBackFaces(true); -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 // Set up caster material - this is just a standard depth/shadow map caster sceneMgr->setShadowTextureCasterMaterial("PSSM/shadow_caster"); #else @@ -607,7 +607,7 @@ void OgreRTShaderSystem::ApplyShadows(OgreScenePtr _scene) // pssmCasterPass->setFog(true); // shadow camera setup -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 if (this->dataPtr->pssmSetup.isNull()) #else if (this->dataPtr->pssmSetup == nullptr) diff --git a/ogre/src/OgreRenderEngine.cc b/ogre/src/OgreRenderEngine.cc index ed66934ec..08b7abec2 100644 --- a/ogre/src/OgreRenderEngine.cc +++ b/ogre/src/OgreRenderEngine.cc @@ -212,7 +212,7 @@ void OgreRenderEngine::AddResourcePath(const std::string &_uri) fullPath); bool matPtrNotNull; -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 matPtrNotNull = !matPtr.isNull(); #else matPtrNotNull = matPtr != nullptr; @@ -721,7 +721,7 @@ void OgreRenderEngine::CheckCapabilities() bool hasVertexPrograms = capabilities->hasCapability(Ogre::RSC_VERTEX_PROGRAM); -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 bool hasFBO = capabilities->hasCapability(Ogre::RSC_FBO); #else diff --git a/ogre/src/OgreScene.cc b/ogre/src/OgreScene.cc index 19352a0f0..c43d6359b 100644 --- a/ogre/src/OgreScene.cc +++ b/ogre/src/OgreScene.cc @@ -207,7 +207,7 @@ void OgreScene::SetGradientBackgroundColor( // Create background rectangle covering the whole screen rect = new ColoredRectangle2D(); rect->setCorners(-1.0, 1.0, 1.0, -1.0); -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 rect->setMaterial("Background"); #else rect->setMaterial(material); diff --git a/ogre/src/OgreText.cc b/ogre/src/OgreText.cc index 7b0d4a238..32538f0fd 100644 --- a/ogre/src/OgreText.cc +++ b/ogre/src/OgreText.cc @@ -350,7 +350,7 @@ void OgreMovableText::SetFontNameImpl(const std::string &_newFontName) } if (this->fontName != _newFontName || -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 this->ogreMaterial.isNull() || !this->font) #else this->ogreMaterial == nullptr || !this->font) @@ -369,7 +369,7 @@ void OgreMovableText::SetFontNameImpl(const std::string &_newFontName) this->font->load(); -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 if (!this->ogreMaterial.isNull()) #else if (this->ogreMaterial) @@ -377,7 +377,7 @@ void OgreMovableText::SetFontNameImpl(const std::string &_newFontName) { Ogre::MaterialManager::getSingletonPtr()->remove( this->ogreMaterial->getName()); -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 this->ogreMaterial.setNull(); #else this->ogreMaterial = nullptr; @@ -403,7 +403,7 @@ void OgreMovableText::SetFontNameImpl(const std::string &_newFontName) void OgreMovableText::SetupGeometry() { IGN_ASSERT(this->font, "font class member is null"); -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 IGN_ASSERT(!this->ogreMaterial.isNull(), "ogreMaterial class member is null"); #else IGN_ASSERT(this->ogreMaterial, "ogreMaterial class member is null"); @@ -740,7 +740,7 @@ void OgreMovableText::UpdateColors() unsigned int i; IGN_ASSERT(this->font, "font class member is null"); -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 IGN_ASSERT(!this->ogreMaterial.isNull(), "ogreMaterial class member is null"); #else IGN_ASSERT(this->ogreMaterial, "ogreMaterial class member is null"); @@ -769,7 +769,7 @@ void OgreMovableText::UpdateColors() ////////////////////////////////////////////////// void OgreMovableText::UpdateMaterial() { -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 if (this->ogreMaterial.isNull()) #else if (!this->ogreMaterial) @@ -859,7 +859,7 @@ void OgreMovableText::getRenderOperation(Ogre::RenderOperation &_op) ////////////////////////////////////////////////// const Ogre::MaterialPtr &OgreMovableText::getMaterial(void) const { -#if OGRE_VERSION_LT_1_10_1 +#if OGRE_VERSION_LT_1_11_0 IGN_ASSERT(!this->ogreMaterial.isNull(), "ogreMaterial class member is null"); #else IGN_ASSERT(this->ogreMaterial, "ogreMaterial class member is null"); diff --git a/ogre/src/OgreThermalCamera.cc b/ogre/src/OgreThermalCamera.cc index cf8b7a7ac..84d6a76f8 100644 --- a/ogre/src/OgreThermalCamera.cc +++ b/ogre/src/OgreThermalCamera.cc @@ -149,7 +149,7 @@ OgreThermalCameraMaterialSwitcher::OgreThermalCameraMaterialSwitcher( Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); // OGRE 1.9 changes the shared pointer definition - #if OGRE_VERSION_LT_1_10_1 + #if OGRE_VERSION_LT_1_11_0 this->heatSourceMaterial = res.staticCast(); #else this->heatSourceMaterial = @@ -422,7 +422,7 @@ void OgreThermalCamera::CreateThermalTexture() Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); // OGRE 1.9 changes the shared pointer definition - #if OGRE_VERSION_LT_1_10_1 + #if OGRE_VERSION_LT_1_11_0 this->dataPtr->thermalMaterial = res.staticCast(); #else this->dataPtr->thermalMaterial = From 32484403bf78d2aa325ffb70c37120093233101c Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 12 Oct 2021 22:27:58 +0200 Subject: [PATCH 3/5] Revert "Avoid symbol redefition to fix armel builds" This reverts commit 6e2544259a3a91d9904af70d6197fbb8fa03d308. Signed-off-by: Jose Luis Rivero --- 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 insertions(+) diff --git a/include/ignition/rendering/Storage.hh b/include/ignition/rendering/Storage.hh index abb6a54b6..82f741045 100644 --- a/include/ignition/rendering/Storage.hh +++ b/include/ignition/rendering/Storage.hh @@ -294,6 +294,16 @@ namespace ignition public: virtual ~StoreWrapper() { } }; + template class Store; + template class Store; + template class Store; + template class Store; + template class Store; + template class Store; + template class Store; + template class Map; + template class CompositeStore; + /// \def SceneStore /// \brief Store of Scene typedef Store SceneStore; diff --git a/ogre/include/ignition/rendering/ogre/OgreStorage.hh b/ogre/include/ignition/rendering/ogre/OgreStorage.hh index 5435168b2..b0468277f 100644 --- a/ogre/include/ignition/rendering/ogre/OgreStorage.hh +++ b/ogre/include/ignition/rendering/ogre/OgreStorage.hh @@ -34,6 +34,15 @@ namespace ignition namespace rendering { inline namespace IGNITION_RENDERING_VERSION_NAMESPACE { + // + template class BaseSceneStore; + template class BaseNodeStore; + template class BaseLightStore; + template class BaseSensorStore; + template class BaseVisualStore; + template class BaseGeometryStore; + template class BaseSubMeshStore; + template class BaseMaterialMap; typedef BaseSceneStore OgreSceneStore; typedef BaseNodeStore OgreNodeStore; diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh index 6ab600026..b37291179 100644 --- a/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh @@ -33,6 +33,14 @@ namespace ignition namespace rendering { inline namespace IGNITION_RENDERING_VERSION_NAMESPACE { + // + template class BaseGeometryStore; + template class BaseLightStore; + template class BaseNodeStore; + template class BaseSceneStore; + template class BaseSensorStore; + template class BaseSubMeshStore; + template class BaseVisualStore; typedef BaseGeometryStore Ogre2GeometryStore; typedef BaseLightStore Ogre2LightStore; From 8a0ea36287e7239ca798d00dcb6d0deceb52bc6a Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 12 Oct 2021 22:32:42 +0200 Subject: [PATCH 4/5] Keep code in non armhf to maintain ABI Signed-off-by: Jose Luis Rivero --- include/ignition/rendering/Storage.hh | 5 +++++ ogre/include/ignition/rendering/ogre/OgreStorage.hh | 7 ++++++- ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh | 7 ++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/include/ignition/rendering/Storage.hh b/include/ignition/rendering/Storage.hh index 82f741045..653269932 100644 --- a/include/ignition/rendering/Storage.hh +++ b/include/ignition/rendering/Storage.hh @@ -294,6 +294,10 @@ namespace ignition public: virtual ~StoreWrapper() { } }; +// armhf failed to build with this code. It can not be removed for the rest +// of arches to keep ABI but should be removed in major versions unreleased +// see https://github.com/ignitionrobotics/ign-rendering/pull/457 +#ifndef __ARM_PCS_VFP template class Store; template class Store; template class Store; @@ -303,6 +307,7 @@ namespace ignition template class Store; template class Map; template class CompositeStore; +#endif /// \def SceneStore /// \brief Store of Scene diff --git a/ogre/include/ignition/rendering/ogre/OgreStorage.hh b/ogre/include/ignition/rendering/ogre/OgreStorage.hh index b0468277f..f6ebaa25f 100644 --- a/ogre/include/ignition/rendering/ogre/OgreStorage.hh +++ b/ogre/include/ignition/rendering/ogre/OgreStorage.hh @@ -34,7 +34,11 @@ namespace ignition namespace rendering { inline namespace IGNITION_RENDERING_VERSION_NAMESPACE { - // + +// armhf failed to build with this code. It can not be removed for the rest +// of arches to keep ABI but should be removed in major versions unreleased +// see https://github.com/ignitionrobotics/ign-rendering/pull/457 +#ifndef __ARM_PCS_VFP template class BaseSceneStore; template class BaseNodeStore; template class BaseLightStore; @@ -43,6 +47,7 @@ namespace ignition template class BaseGeometryStore; template class BaseSubMeshStore; template class BaseMaterialMap; +#endif typedef BaseSceneStore OgreSceneStore; typedef BaseNodeStore OgreNodeStore; diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh index b37291179..318cf7da5 100644 --- a/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh @@ -33,7 +33,11 @@ namespace ignition namespace rendering { inline namespace IGNITION_RENDERING_VERSION_NAMESPACE { - // + +// armhf failed to build with this code. It can not be removed for the rest +// of arches to keep ABI but should be removed in major versions unreleased +// see https://github.com/ignitionrobotics/ign-rendering/pull/457 +#ifndef __ARM_PCS_VFP template class BaseGeometryStore; template class BaseLightStore; template class BaseNodeStore; @@ -41,6 +45,7 @@ namespace ignition template class BaseSensorStore; template class BaseSubMeshStore; template class BaseVisualStore; +#endif typedef BaseGeometryStore Ogre2GeometryStore; typedef BaseLightStore Ogre2LightStore; From 7244aaafaf9eb12a913335aebaddeb3d65e3f88d Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 13 Oct 2021 18:32:02 +0200 Subject: [PATCH 5/5] Remove trailing Signed-off-by: Jose Luis Rivero --- ogre/include/ignition/rendering/ogre/OgreStorage.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogre/include/ignition/rendering/ogre/OgreStorage.hh b/ogre/include/ignition/rendering/ogre/OgreStorage.hh index f6ebaa25f..bd113c1fb 100644 --- a/ogre/include/ignition/rendering/ogre/OgreStorage.hh +++ b/ogre/include/ignition/rendering/ogre/OgreStorage.hh @@ -34,7 +34,7 @@ namespace ignition namespace rendering { inline namespace IGNITION_RENDERING_VERSION_NAMESPACE { - + // armhf failed to build with this code. It can not be removed for the rest // of arches to keep ABI but should be removed in major versions unreleased // see https://github.com/ignitionrobotics/ign-rendering/pull/457