From 28c15aeb93593cbf64f35ec19f70d1e8e59d1e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 9 Feb 2013 12:35:06 +0100 Subject: [PATCH] Clang fixes for friend declarations. Friending only constructor apparently doesn't help, specifying full-scope name for Resource. --- src/ResourceManager.h | 2 +- src/SceneGraph/AbstractObject.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ResourceManager.h b/src/ResourceManager.h index 380b2af7a..1c0128e85 100644 --- a/src/ResourceManager.h +++ b/src/ResourceManager.h @@ -89,7 +89,7 @@ namespace Implementation { }; template class ResourceManagerData { - template friend class Resource; + template friend class Magnum::Resource; friend class AbstractResourceLoader; ResourceManagerData(const ResourceManagerData&) = delete; diff --git a/src/SceneGraph/AbstractObject.h b/src/SceneGraph/AbstractObject.h index 5714c9a92..233c9a878 100644 --- a/src/SceneGraph/AbstractObject.h +++ b/src/SceneGraph/AbstractObject.h @@ -55,7 +55,7 @@ template class AbstractObject { friend class Corrade::Containers::LinkedList>; friend class Corrade::Containers::LinkedListItem, AbstractObject>; - friend AbstractFeature::AbstractFeature(AbstractObject*); + friend class AbstractFeature; public: /** @brief Feature object type */