Browse Source

GCC 4.4 compatibility: fix linking with defaulted destructors.

Vladimír Vondruš 12 years ago
parent
commit
7726a0e4f4
  1. 3
      src/Magnum/DebugTools/ForceRenderer.cpp
  2. 3
      src/Magnum/DebugTools/ObjectRenderer.cpp

3
src/Magnum/DebugTools/ForceRenderer.cpp

@ -96,7 +96,8 @@ template<UnsignedInt dimensions> ForceRenderer<dimensions>::ForceRenderer(SceneG
}
/* To avoid deleting pointers to incomplete type on destruction of Resource members */
template<UnsignedInt dimensions> ForceRenderer<dimensions>::~ForceRenderer() = default;
/* GCC 4.4 has linker error when using =default */
template<UnsignedInt dimensions> ForceRenderer<dimensions>::~ForceRenderer() {}
template<UnsignedInt dimensions> void ForceRenderer<dimensions>::draw(const typename DimensionTraits<dimensions, Float>::MatrixType& transformationMatrix, SceneGraph::AbstractCamera<dimensions, Float>& camera) {
shader->setTransformationProjectionMatrix(camera.projectionMatrix()*Implementation::forceRendererTransformation<dimensions>(transformationMatrix.transformPoint(forcePosition), force)*DimensionTraits<dimensions, Float>::MatrixType::scaling(typename DimensionTraits<dimensions, Float>::VectorType(options->scale())))

3
src/Magnum/DebugTools/ObjectRenderer.cpp

@ -176,7 +176,8 @@ template<UnsignedInt dimensions> ObjectRenderer<dimensions>::ObjectRenderer(Scen
}
/* To avoid deleting pointers to incomplete type on destruction of Resource members */
template<UnsignedInt dimensions> ObjectRenderer<dimensions>::~ObjectRenderer() = default;
/* GCC 4.4 has linker error when using =default */
template<UnsignedInt dimensions> ObjectRenderer<dimensions>::~ObjectRenderer() {}
template<UnsignedInt dimensions> void ObjectRenderer<dimensions>::draw(const typename DimensionTraits<dimensions, Float>::MatrixType& transformationMatrix, SceneGraph::AbstractCamera<dimensions, Float>& camera) {
shader->setTransformationProjectionMatrix(camera.projectionMatrix()*transformationMatrix*DimensionTraits<dimensions, Float>::MatrixType::scaling(typename DimensionTraits<dimensions, Float>::VectorType(options->size())));

Loading…
Cancel
Save