From 7726a0e4f4621f9e36475b19304b4c5be518cba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 28 Jun 2014 19:18:51 +0200 Subject: [PATCH] GCC 4.4 compatibility: fix linking with defaulted destructors. --- src/Magnum/DebugTools/ForceRenderer.cpp | 3 ++- src/Magnum/DebugTools/ObjectRenderer.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Magnum/DebugTools/ForceRenderer.cpp b/src/Magnum/DebugTools/ForceRenderer.cpp index 6c020cb12..620d1ba12 100644 --- a/src/Magnum/DebugTools/ForceRenderer.cpp +++ b/src/Magnum/DebugTools/ForceRenderer.cpp @@ -96,7 +96,8 @@ template ForceRenderer::ForceRenderer(SceneG } /* To avoid deleting pointers to incomplete type on destruction of Resource members */ -template ForceRenderer::~ForceRenderer() = default; +/* GCC 4.4 has linker error when using =default */ +template ForceRenderer::~ForceRenderer() {} template void ForceRenderer::draw(const typename DimensionTraits::MatrixType& transformationMatrix, SceneGraph::AbstractCamera& camera) { shader->setTransformationProjectionMatrix(camera.projectionMatrix()*Implementation::forceRendererTransformation(transformationMatrix.transformPoint(forcePosition), force)*DimensionTraits::MatrixType::scaling(typename DimensionTraits::VectorType(options->scale()))) diff --git a/src/Magnum/DebugTools/ObjectRenderer.cpp b/src/Magnum/DebugTools/ObjectRenderer.cpp index eacfa6d2b..3bbd3c5c4 100644 --- a/src/Magnum/DebugTools/ObjectRenderer.cpp +++ b/src/Magnum/DebugTools/ObjectRenderer.cpp @@ -176,7 +176,8 @@ template ObjectRenderer::ObjectRenderer(Scen } /* To avoid deleting pointers to incomplete type on destruction of Resource members */ -template ObjectRenderer::~ObjectRenderer() = default; +/* GCC 4.4 has linker error when using =default */ +template ObjectRenderer::~ObjectRenderer() {} template void ObjectRenderer::draw(const typename DimensionTraits::MatrixType& transformationMatrix, SceneGraph::AbstractCamera& camera) { shader->setTransformationProjectionMatrix(camera.projectionMatrix()*transformationMatrix*DimensionTraits::MatrixType::scaling(typename DimensionTraits::VectorType(options->size())));