From a387e23f433a28a484bf73b282187c5f4b41c32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 24 Nov 2012 11:11:02 +0100 Subject: [PATCH] Updated forward declarations. --- src/Magnum.h | 3 ++- src/Resource.h | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Magnum.h b/src/Magnum.h index fd941af29..363d6d97c 100644 --- a/src/Magnum.h +++ b/src/Magnum.h @@ -155,7 +155,8 @@ class Renderbuffer; enum class ResourceState: std::uint8_t; enum class ResourceDataState: std::uint8_t; enum class ResourcePolicy: std::uint8_t; -template class Resource; +template class Resource; +class ResourceKey; template class ResourceManager; class Shader; diff --git a/src/Resource.h b/src/Resource.h index 0909d5eb5..35ddebda2 100644 --- a/src/Resource.h +++ b/src/Resource.h @@ -19,6 +19,8 @@ * @brief Class Magnum::ResourceKey, Magnum::Resource, enum Magnum::ResourceState, Magnum::ResourceDataState, Magnum::ResourcePolicy */ +#include "Magnum.h" + namespace Magnum { /** @relates ResourceManager @@ -118,7 +120,12 @@ namespace Implementation { See ResourceManager for more information. */ -template class Resource { +#ifndef DOXYGEN_GENERATING_OUTPUT +template +#else +template +#endif +class Resource { friend class Implementation::ResourceManagerData; public: