From 3610a80dfd931d468662cb3516c9ab5c00be6624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 9 Feb 2013 12:37:16 +0100 Subject: [PATCH] Clang fixes for templated base classes. Unlike GCC it does need the `template` keyword on weird places. --- src/SceneGraph/AbstractFeature.h | 2 +- src/SceneGraph/EuclideanMatrixTransformation2D.h | 2 +- src/SceneGraph/MatrixTransformation2D.h | 2 +- src/SceneGraph/Object.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SceneGraph/AbstractFeature.h b/src/SceneGraph/AbstractFeature.h index 38b76eb3a..3b8d344dc 100644 --- a/src/SceneGraph/AbstractFeature.h +++ b/src/SceneGraph/AbstractFeature.h @@ -133,7 +133,7 @@ template class AbstractFeature * @param object %Object holding this feature */ inline explicit AbstractFeature(AbstractObject* object) { - object->Corrade::Containers::LinkedList>::insert(this); + object->Corrade::Containers::template LinkedList>::insert(this); } virtual ~AbstractFeature() = 0; diff --git a/src/SceneGraph/EuclideanMatrixTransformation2D.h b/src/SceneGraph/EuclideanMatrixTransformation2D.h index fa80ed2a6..3b497cf40 100644 --- a/src/SceneGraph/EuclideanMatrixTransformation2D.h +++ b/src/SceneGraph/EuclideanMatrixTransformation2D.h @@ -128,7 +128,7 @@ class EuclideanMatrixTransformation2D: public AbstractTranslationRotation2D { * @return Pointer to self (for method chaining) */ inline EuclideanMatrixTransformation2D* move(Object>* under) { - static_cast*>(this)->Corrade::Containers::LinkedList>>::move(this, under); + static_cast*>(this)->Corrade::Containers::template LinkedList>>::move(this, under); return this; } diff --git a/src/SceneGraph/MatrixTransformation2D.h b/src/SceneGraph/MatrixTransformation2D.h index fa469bc42..08f1fdbd0 100644 --- a/src/SceneGraph/MatrixTransformation2D.h +++ b/src/SceneGraph/MatrixTransformation2D.h @@ -139,7 +139,7 @@ class MatrixTransformation2D: public AbstractTranslationRotationScaling2D { * @return Pointer to self (for method chaining) */ inline MatrixTransformation2D* move(Object>* under) { - static_cast*>(this)->Corrade::Containers::LinkedList>>::move(this, under); + static_cast*>(this)->Corrade::Containers::template LinkedList>>::move(this, under); return this; } diff --git a/src/SceneGraph/Object.hpp b/src/SceneGraph/Object.hpp index 72c45dfec..708384def 100644 --- a/src/SceneGraph/Object.hpp +++ b/src/SceneGraph/Object.hpp @@ -69,7 +69,7 @@ template Object* Object::s } /* Remove the object from old parent children list */ - if(this->parent()) this->parent()->Corrade::Containers::LinkedList>::cut(this); + if(this->parent()) this->parent()->Corrade::Containers::template LinkedList>::cut(this); /* Add the object to list of new parent */ if(parent) parent->Corrade::Containers::LinkedList>::insert(this);