Browse Source

SceneGraph: fixed compilation of Drawable on GCC 4.6.

This error was present since the very beginning but it didn't appear
until we were explicitly instantiating the Drawable class.
pull/51/head
Vladimír Vondruš 12 years ago
parent
commit
9743d2abf3
  1. 8
      src/Magnum/SceneGraph/Drawable.h

8
src/Magnum/SceneGraph/Drawable.h

@ -147,12 +147,20 @@ template<UnsignedInt dimensions, class T> class Drawable: public AbstractGrouped
* If the drawable doesn't belong to any group, returns `nullptr`.
*/
DrawableGroup<dimensions, T>* drawables() {
#ifndef CORRADE_GCC46_COMPATIBILITY
return AbstractGroupedFeature<dimensions, Drawable<dimensions, T>, T>::group();
#else
return static_cast<DrawableGroup<dimensions, T>*>(AbstractGroupedFeature<dimensions, Drawable<dimensions, T>, T>::group());
#endif
}
/** @overload */
const DrawableGroup<dimensions, T>* drawables() const {
#ifndef CORRADE_GCC46_COMPATIBILITY
return AbstractGroupedFeature<dimensions, Drawable<dimensions, T>, T>::group();
#else
return static_cast<const DrawableGroup<dimensions, T>*>(AbstractGroupedFeature<dimensions, Drawable<dimensions, T>, T>::group());
#endif
}
/**

Loading…
Cancel
Save