From f3e02008fb44bb81d22954d6747ce8259d2e3dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 10 Dec 2014 01:08:25 +0100 Subject: [PATCH] No need to use class/struct keyword in friend declarations. --- src/Magnum/AbstractFramebuffer.h | 2 +- src/Magnum/AbstractObject.h | 2 +- src/Magnum/AbstractQuery.h | 2 +- src/Magnum/AbstractResourceLoader.h | 2 +- src/Magnum/AbstractShaderProgram.h | 8 ++++---- src/Magnum/AbstractTexture.h | 4 ++-- src/Magnum/Buffer.h | 2 +- src/Magnum/BufferTexture.h | 2 +- src/Magnum/Context.h | 4 ++-- src/Magnum/CubeMapTexture.h | 2 +- src/Magnum/DebugMessage.h | 2 +- src/Magnum/DefaultFramebuffer.h | 2 +- src/Magnum/Framebuffer.h | 4 ++-- src/Magnum/Mesh.h | 4 ++-- src/Magnum/MeshView.h | 2 +- src/Magnum/Platform/AbstractXApplication.h | 6 +++--- src/Magnum/Platform/AndroidApplication.h | 4 ++-- src/Magnum/Platform/GlutApplication.h | 6 +++--- src/Magnum/Platform/NaClApplication.h | 6 +++--- src/Magnum/Platform/Screen.h | 6 +++--- src/Magnum/Platform/ScreenedApplication.h | 6 +++--- src/Magnum/Platform/Sdl2Application.h | 6 +++--- src/Magnum/Renderbuffer.h | 2 +- src/Magnum/Renderer.h | 4 ++-- src/Magnum/Resource.h | 2 +- src/Magnum/ResourceManager.h | 2 +- src/Magnum/SceneGraph/AbstractFeature.h | 6 +++--- src/Magnum/SceneGraph/AbstractGroupedFeature.h | 2 +- src/Magnum/SceneGraph/AbstractObject.h | 6 +++--- src/Magnum/SceneGraph/Animable.h | 2 +- src/Magnum/SceneGraph/AnimableGroup.h | 2 +- src/Magnum/SceneGraph/FeatureGroup.h | 2 +- src/Magnum/SceneGraph/Object.h | 4 ++-- src/Magnum/Shapes/Composition.h | 2 +- src/Magnum/Shapes/Shape.h | 2 +- src/Magnum/Shapes/ShapeGroup.h | 2 +- src/Magnum/TransformFeedback.h | 2 +- 37 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/Magnum/AbstractFramebuffer.h b/src/Magnum/AbstractFramebuffer.h index 91d6b1fe4..578b9db94 100644 --- a/src/Magnum/AbstractFramebuffer.h +++ b/src/Magnum/AbstractFramebuffer.h @@ -177,7 +177,7 @@ If @extension{ARB,robustness} is available, @ref read() operations are protected from buffer overflow. */ class MAGNUM_EXPORT AbstractFramebuffer { - friend struct Implementation::FramebufferState; + friend Implementation::FramebufferState; public: /** @todo `GL_IMPLEMENTATION_COLOR_READ_FORMAT`, `GL_IMPLEMENTATION_COLOR_READ_TYPE`, seems to be depending on currently bound FB (aargh) (@extension{ARB,ES2_compatibility}). */ diff --git a/src/Magnum/AbstractObject.h b/src/Magnum/AbstractObject.h index 10cc5b821..8b3e21ede 100644 --- a/src/Magnum/AbstractObject.h +++ b/src/Magnum/AbstractObject.h @@ -44,7 +44,7 @@ namespace Implementation { struct DebugState; } @brief Base for all OpenGL objects */ class MAGNUM_EXPORT AbstractObject { - friend struct Implementation::DebugState; + friend Implementation::DebugState; public: /** diff --git a/src/Magnum/AbstractQuery.h b/src/Magnum/AbstractQuery.h index c5ac0b97e..357357193 100644 --- a/src/Magnum/AbstractQuery.h +++ b/src/Magnum/AbstractQuery.h @@ -47,7 +47,7 @@ more information. @todo `QUERY_COUNTER_BITS` (not sure since when this is supported) */ class MAGNUM_EXPORT AbstractQuery: public AbstractObject { - friend struct Implementation::QueryState; + friend Implementation::QueryState; public: /** @brief Copying is not allowed */ diff --git a/src/Magnum/AbstractResourceLoader.h b/src/Magnum/AbstractResourceLoader.h index 6aa97f44a..1c26f858f 100644 --- a/src/Magnum/AbstractResourceLoader.h +++ b/src/Magnum/AbstractResourceLoader.h @@ -101,7 +101,7 @@ Resource myMesh = manager->get("my-mesh"); buffers), should that be allowed? */ template class AbstractResourceLoader { - friend class Implementation::ResourceManagerData; + friend Implementation::ResourceManagerData; public: explicit AbstractResourceLoader(): manager(nullptr), _requestedCount(0), _loadedCount(0), _notFoundCount(0) {} diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h index ca26af4ed..bc96ed2e5 100644 --- a/src/Magnum/AbstractShaderProgram.h +++ b/src/Magnum/AbstractShaderProgram.h @@ -392,10 +392,10 @@ comes in handy. @todo `GL_NUM_{PROGRAM,SHADER}_BINARY_FORMATS` + `GL_{PROGRAM,SHADER}_BINARY_FORMATS` (vector), (@extension{ARB,ES2_compatibility}) */ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject { - friend class Mesh; - friend class MeshView; - friend class TransformFeedback; - friend struct Implementation::ShaderProgramState; + friend Mesh; + friend MeshView; + friend TransformFeedback; + friend Implementation::ShaderProgramState; public: #ifndef MAGNUM_TARGET_GLES2 diff --git a/src/Magnum/AbstractTexture.h b/src/Magnum/AbstractTexture.h index e40536423..16a6d2cf4 100644 --- a/src/Magnum/AbstractTexture.h +++ b/src/Magnum/AbstractTexture.h @@ -133,8 +133,8 @@ functions do nothing. @todo Query for immutable levels (@extension{ARB,ES3_compatibility}) */ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { - friend struct Implementation::TextureState; - friend class CubeMapTexture; + friend Implementation::TextureState; + friend CubeMapTexture; public: #ifdef MAGNUM_BUILD_DEPRECATED diff --git a/src/Magnum/Buffer.h b/src/Magnum/Buffer.h index 3aae0bba4..fb8280d6f 100644 --- a/src/Magnum/Buffer.h +++ b/src/Magnum/Buffer.h @@ -209,7 +209,7 @@ by OpenGL in order to preserve the data. If running on OpenGL ES or extension functions do nothing. */ class MAGNUM_EXPORT Buffer: public AbstractObject { - friend struct Implementation::BufferState; + friend Implementation::BufferState; public: /** diff --git a/src/Magnum/BufferTexture.h b/src/Magnum/BufferTexture.h index 152a0bb59..eaf8f4998 100644 --- a/src/Magnum/BufferTexture.h +++ b/src/Magnum/BufferTexture.h @@ -200,7 +200,7 @@ and respective function documentation for more information. @requires_gl Texture buffers are not available in OpenGL ES. */ class MAGNUM_EXPORT BufferTexture: public AbstractTexture { - friend struct Implementation::TextureState; + friend Implementation::TextureState; public: /** diff --git a/src/Magnum/Context.h b/src/Magnum/Context.h index 031c1a411..ac120e8c1 100644 --- a/src/Magnum/Context.h +++ b/src/Magnum/Context.h @@ -56,7 +56,7 @@ See also @ref Extensions namespace, which contain compile-time information about OpenGL extensions. */ class MAGNUM_EXPORT Extension { - friend class Context; + friend Context; public: /** @brief All extensions for given OpenGL version */ @@ -94,7 +94,7 @@ using @ref Platform::Context subclass, see @ref platform documentation for more information. */ class MAGNUM_EXPORT Context { - friend class Platform::Context; + friend Platform::Context; public: /** diff --git a/src/Magnum/CubeMapTexture.h b/src/Magnum/CubeMapTexture.h index 8ee20bf94..a53309515 100644 --- a/src/Magnum/CubeMapTexture.h +++ b/src/Magnum/CubeMapTexture.h @@ -80,7 +80,7 @@ which intersects one of the six sides of the cube map. See @ref MultisampleTexture */ class MAGNUM_EXPORT CubeMapTexture: public AbstractTexture { - friend struct Implementation::TextureState; + friend Implementation::TextureState; public: /** @brief Cube map coordinate */ diff --git a/src/Magnum/DebugMessage.h b/src/Magnum/DebugMessage.h index 3e74615a3..b657c9eb0 100644 --- a/src/Magnum/DebugMessage.h +++ b/src/Magnum/DebugMessage.h @@ -71,7 +71,7 @@ With default callback the messages will be printed on standard output: Hello from OpenGL command stream! */ class MAGNUM_EXPORT DebugMessage { - friend struct Implementation::DebugState; + friend Implementation::DebugState; public: /** diff --git a/src/Magnum/DefaultFramebuffer.h b/src/Magnum/DefaultFramebuffer.h index e9a938ed7..2ded32cfd 100644 --- a/src/Magnum/DefaultFramebuffer.h +++ b/src/Magnum/DefaultFramebuffer.h @@ -81,7 +81,7 @@ use DSA to avoid unnecessary calls to @fn_gl{BindFramebuffer}. See their respective documentation for more information. */ class MAGNUM_EXPORT DefaultFramebuffer: public AbstractFramebuffer { - friend class Context; + friend Context; public: /** diff --git a/src/Magnum/Framebuffer.h b/src/Magnum/Framebuffer.h index 27eb837c6..b2af3ec11 100644 --- a/src/Magnum/Framebuffer.h +++ b/src/Magnum/Framebuffer.h @@ -105,7 +105,7 @@ information. @todo `MAX_COLOR_ATTACHMENTS` */ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObject { - friend struct Implementation::FramebufferState; + friend Implementation::FramebufferState; public: /** @@ -116,7 +116,7 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * @ref attachCubeMapTexture(), @ref attachTexture3D() */ class ColorAttachment { - friend class Framebuffer; + friend Framebuffer; public: /** diff --git a/src/Magnum/Mesh.h b/src/Magnum/Mesh.h index 6b8bb20ea..80816a651 100644 --- a/src/Magnum/Mesh.h +++ b/src/Magnum/Mesh.h @@ -336,8 +336,8 @@ drawing commands are used on desktop OpenGL and OpenGL ES 3.0. See also @ref draw() for more information. */ class MAGNUM_EXPORT Mesh: public AbstractObject { - friend class MeshView; - friend struct Implementation::MeshState; + friend MeshView; + friend Implementation::MeshState; public: #ifdef MAGNUM_BUILD_DEPRECATED diff --git a/src/Magnum/MeshView.h b/src/Magnum/MeshView.h index cf39a94cb..14f06802f 100644 --- a/src/Magnum/MeshView.h +++ b/src/Magnum/MeshView.h @@ -57,7 +57,7 @@ You must ensure that the original mesh remains available for whole view lifetime. */ class MAGNUM_EXPORT MeshView { - friend struct Implementation::MeshState; + friend Implementation::MeshState; public: /** diff --git a/src/Magnum/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h index b86e90796..e9bfd104f 100644 --- a/src/Magnum/Platform/AbstractXApplication.h +++ b/src/Magnum/Platform/AbstractXApplication.h @@ -334,7 +334,7 @@ CORRADE_ENUMSET_OPERATORS(AbstractXApplication::InputEvent::Buttons) @see @ref keyPressEvent(), @ref keyReleaseEvent() */ class AbstractXApplication::KeyEvent: public AbstractXApplication::InputEvent { - friend class AbstractXApplication; + friend AbstractXApplication; public: /** @@ -434,7 +434,7 @@ class AbstractXApplication::KeyEvent: public AbstractXApplication::InputEvent { @see @ref MouseMoveEvent, @ref mousePressEvent(), @ref mouseReleaseEvent() */ class AbstractXApplication::MouseEvent: public AbstractXApplication::InputEvent { - friend class AbstractXApplication; + friend AbstractXApplication; public: /** @@ -469,7 +469,7 @@ class AbstractXApplication::MouseEvent: public AbstractXApplication::InputEvent @see @ref MouseEvent, @ref mouseMoveEvent() */ class AbstractXApplication::MouseMoveEvent: public AbstractXApplication::InputEvent { - friend class AbstractXApplication; + friend AbstractXApplication; public: /** @brief Position */ diff --git a/src/Magnum/Platform/AndroidApplication.h b/src/Magnum/Platform/AndroidApplication.h index 571e72955..22a8c4561 100644 --- a/src/Magnum/Platform/AndroidApplication.h +++ b/src/Magnum/Platform/AndroidApplication.h @@ -418,7 +418,7 @@ class AndroidApplication::InputEvent { @see @ref MouseMoveEvent, @ref mousePressEvent(), @ref mouseReleaseEvent() */ class AndroidApplication::MouseEvent: public InputEvent { - friend class AndroidApplication; + friend AndroidApplication; public: /** @@ -490,7 +490,7 @@ class AndroidApplication::MouseEvent: public InputEvent { @see @ref MouseEvent, @ref mouseMoveEvent() */ class AndroidApplication::MouseMoveEvent: public InputEvent { - friend class AndroidApplication; + friend AndroidApplication; public: /** diff --git a/src/Magnum/Platform/GlutApplication.h b/src/Magnum/Platform/GlutApplication.h index 94dc2e0a7..0539ee948 100644 --- a/src/Magnum/Platform/GlutApplication.h +++ b/src/Magnum/Platform/GlutApplication.h @@ -424,7 +424,7 @@ class GlutApplication::InputEvent { @see @ref keyPressEvent() */ class GlutApplication::KeyEvent: public GlutApplication::InputEvent { - friend class GlutApplication; + friend GlutApplication; public: /** @@ -523,7 +523,7 @@ class GlutApplication::KeyEvent: public GlutApplication::InputEvent { @see @ref MouseMoveEvent, @ref mousePressEvent(), @ref mouseReleaseEvent() */ class GlutApplication::MouseEvent: public GlutApplication::InputEvent { - friend class GlutApplication; + friend GlutApplication; public: /** @@ -558,7 +558,7 @@ class GlutApplication::MouseEvent: public GlutApplication::InputEvent { @see @ref MouseEvent, @ref mouseMoveEvent() */ class GlutApplication::MouseMoveEvent: public GlutApplication::InputEvent { - friend class GlutApplication; + friend GlutApplication; public: /** diff --git a/src/Magnum/Platform/NaClApplication.h b/src/Magnum/Platform/NaClApplication.h index 26a2a2fb4..a279ecf23 100644 --- a/src/Magnum/Platform/NaClApplication.h +++ b/src/Magnum/Platform/NaClApplication.h @@ -557,7 +557,7 @@ See also @ref InputEvent for more information. @see @ref keyPressEvent(), @ref keyReleaseEvent() */ class NaClApplication::KeyEvent: public NaClApplication::InputEvent { - friend class NaClApplication; + friend NaClApplication; public: /** @@ -652,7 +652,7 @@ See also @ref InputEvent for more information. @see @ref MouseMoveEvent, @ref mousePressEvent(), @ref mouseReleaseEvent() */ class NaClApplication::MouseEvent: public NaClApplication::InputEvent { - friend class NaClApplication; + friend NaClApplication; public: /** @@ -694,7 +694,7 @@ See also @ref InputEvent for more information. @see @ref MouseEvent, @ref mouseMoveEvent() */ class NaClApplication::MouseMoveEvent: public NaClApplication::InputEvent { - friend class NaClApplication; + friend NaClApplication; public: /** @brief Position */ diff --git a/src/Magnum/Platform/Screen.h b/src/Magnum/Platform/Screen.h index 0d0043a32..98501d8da 100644 --- a/src/Magnum/Platform/Screen.h +++ b/src/Magnum/Platform/Screen.h @@ -67,9 +67,9 @@ The following specialization are explicitly compiled into each particular - @ref XEglApplication "BasicScreen" */ template class BasicScreen: private Containers::LinkedListItem, BasicScreenedApplication> { - friend class Containers::LinkedListItem, BasicScreenedApplication>; - friend class Containers::LinkedList>; - friend class BasicScreenedApplication; + friend Containers::LinkedListItem, BasicScreenedApplication>; + friend Containers::LinkedList>; + friend BasicScreenedApplication; public: #ifdef DOXYGEN_GENERATING_OUTPUT diff --git a/src/Magnum/Platform/ScreenedApplication.h b/src/Magnum/Platform/ScreenedApplication.h index d43a90af6..c552de591 100644 --- a/src/Magnum/Platform/ScreenedApplication.h +++ b/src/Magnum/Platform/ScreenedApplication.h @@ -89,9 +89,9 @@ The following specialization are explicitly compiled into each particular - @ref XEglApplication "BasicScreenedApplication" */ template class BasicScreenedApplication: public Application, private Containers::LinkedList> { - friend class Containers::LinkedList>; - friend class Containers::LinkedListItem, BasicScreenedApplication>; - friend class BasicScreen; + friend Containers::LinkedList>; + friend Containers::LinkedListItem, BasicScreenedApplication>; + friend BasicScreen; public: /** diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index 2c6c8cef0..f57dba419 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -692,7 +692,7 @@ class Sdl2Application::InputEvent { @see @ref keyPressEvent(), @ref keyReleaseEvent() */ class Sdl2Application::KeyEvent: public Sdl2Application::InputEvent { - friend class Sdl2Application; + friend Sdl2Application; public: /** @@ -792,7 +792,7 @@ class Sdl2Application::KeyEvent: public Sdl2Application::InputEvent { @see @ref MouseMoveEvent, @ref mousePressEvent(), @ref mouseReleaseEvent() */ class Sdl2Application::MouseEvent: public Sdl2Application::InputEvent { - friend class Sdl2Application; + friend Sdl2Application; public: /** @@ -836,7 +836,7 @@ class Sdl2Application::MouseEvent: public Sdl2Application::InputEvent { @see @ref MouseEvent, @ref mouseMoveEvent() */ class Sdl2Application::MouseMoveEvent: public Sdl2Application::InputEvent { - friend class Sdl2Application; + friend Sdl2Application; public: /** diff --git a/src/Magnum/Renderbuffer.h b/src/Magnum/Renderbuffer.h index 41969db8a..8df3a2de3 100644 --- a/src/Magnum/Renderbuffer.h +++ b/src/Magnum/Renderbuffer.h @@ -60,7 +60,7 @@ information. @requires_gl30 Extension @extension{ARB,framebuffer_object} */ class MAGNUM_EXPORT Renderbuffer: public AbstractObject { - friend struct Implementation::FramebufferState; + friend Implementation::FramebufferState; public: /** diff --git a/src/Magnum/Renderer.h b/src/Magnum/Renderer.h index 47966eb5c..3e88a71fb 100644 --- a/src/Magnum/Renderer.h +++ b/src/Magnum/Renderer.h @@ -48,8 +48,8 @@ namespace Implementation { struct RendererState; } @todo `GL_MAX_CLIP_DISTANCES`... */ class MAGNUM_EXPORT Renderer { - friend class Context; - friend struct Implementation::RendererState; + friend Context; + friend Implementation::RendererState; public: Renderer() = delete; diff --git a/src/Magnum/Resource.h b/src/Magnum/Resource.h index a7f526024..c33a3d532 100644 --- a/src/Magnum/Resource.h +++ b/src/Magnum/Resource.h @@ -116,7 +116,7 @@ template template #endif class Resource { - friend class Implementation::ResourceManagerData; + friend Implementation::ResourceManagerData; public: /** diff --git a/src/Magnum/ResourceManager.h b/src/Magnum/ResourceManager.h index 426a7adfc..f5c6ab8e4 100644 --- a/src/Magnum/ResourceManager.h +++ b/src/Magnum/ResourceManager.h @@ -96,7 +96,7 @@ namespace Implementation { template class ResourceManagerData { template friend class Magnum::Resource; - friend class AbstractResourceLoader; + friend AbstractResourceLoader; public: ResourceManagerData(const ResourceManagerData&) = delete; diff --git a/src/Magnum/SceneGraph/AbstractFeature.h b/src/Magnum/SceneGraph/AbstractFeature.h index a5e4e064b..8a2a6da8c 100644 --- a/src/Magnum/SceneGraph/AbstractFeature.h +++ b/src/Magnum/SceneGraph/AbstractFeature.h @@ -169,9 +169,9 @@ template class AbstractFeature : private Containers::LinkedListItem, AbstractObject> #endif { - friend class Containers::LinkedList>; - friend class Containers::LinkedListItem, AbstractObject>; - template friend class Object; + friend Containers::LinkedList>; + friend Containers::LinkedListItem, AbstractObject>; + template friend class Object; public: /** diff --git a/src/Magnum/SceneGraph/AbstractGroupedFeature.h b/src/Magnum/SceneGraph/AbstractGroupedFeature.h index d13398392..ec79ddd0b 100644 --- a/src/Magnum/SceneGraph/AbstractGroupedFeature.h +++ b/src/Magnum/SceneGraph/AbstractGroupedFeature.h @@ -68,7 +68,7 @@ errors. See also @ref compilation-speedup-hpp for more information. @ref AbstractGroupedFeature3D, @ref FeatureGroup */ template class AbstractGroupedFeature: public AbstractFeature { - friend class FeatureGroup; + friend FeatureGroup; public: /** diff --git a/src/Magnum/SceneGraph/AbstractObject.h b/src/Magnum/SceneGraph/AbstractObject.h index eda0837b3..e733f5ec4 100644 --- a/src/Magnum/SceneGraph/AbstractObject.h +++ b/src/Magnum/SceneGraph/AbstractObject.h @@ -76,9 +76,9 @@ template class AbstractObject : private Containers::LinkedList> #endif { - friend class Containers::LinkedList>; - friend class Containers::LinkedListItem, AbstractObject>; - friend class AbstractFeature; + friend Containers::LinkedList>; + friend Containers::LinkedListItem, AbstractObject>; + friend AbstractFeature; public: /** @brief Matrix type */ diff --git a/src/Magnum/SceneGraph/Animable.h b/src/Magnum/SceneGraph/Animable.h index 1bd6650ef..ebba40887 100644 --- a/src/Magnum/SceneGraph/Animable.h +++ b/src/Magnum/SceneGraph/Animable.h @@ -142,7 +142,7 @@ errors. See also @ref compilation-speedup-hpp for more information. @ref Animable2D, @ref Animable3D, @ref AnimableGroup */ template class Animable: public AbstractGroupedFeature, T> { - friend class AnimableGroup; + friend AnimableGroup; public: /** diff --git a/src/Magnum/SceneGraph/AnimableGroup.h b/src/Magnum/SceneGraph/AnimableGroup.h index 53b5dded7..eae73fe55 100644 --- a/src/Magnum/SceneGraph/AnimableGroup.h +++ b/src/Magnum/SceneGraph/AnimableGroup.h @@ -42,7 +42,7 @@ See @ref Animable for more information. @ref AnimableGroup2D, @ref AnimableGroup3D */ template class AnimableGroup: public FeatureGroup, T> { - friend class Animable; + friend Animable; public: /** diff --git a/src/Magnum/SceneGraph/FeatureGroup.h b/src/Magnum/SceneGraph/FeatureGroup.h index a4ee47d58..3af1a1945 100644 --- a/src/Magnum/SceneGraph/FeatureGroup.h +++ b/src/Magnum/SceneGraph/FeatureGroup.h @@ -62,7 +62,7 @@ See @ref AbstractGroupedFeature for more information. @ref FeatureGroup2D, @ref FeatureGroup3D */ template class FeatureGroup: public AbstractFeatureGroup { - friend class AbstractGroupedFeature; + friend AbstractGroupedFeature; public: explicit FeatureGroup() = default; diff --git a/src/Magnum/SceneGraph/Object.h b/src/Magnum/SceneGraph/Object.h index cfe8025f4..d1d962c1b 100644 --- a/src/Magnum/SceneGraph/Object.h +++ b/src/Magnum/SceneGraph/Object.h @@ -102,8 +102,8 @@ template class Object: public AbstractObject>, private Containers::LinkedListItem, Object> #endif { - friend class Containers::LinkedList>; - friend class Containers::LinkedListItem, Object>; + friend Containers::LinkedList>; + friend Containers::LinkedListItem, Object>; public: /** @brief Matrix type */ diff --git a/src/Magnum/Shapes/Composition.h b/src/Magnum/Shapes/Composition.h index 185ad3cec..d0394e6ce 100644 --- a/src/Magnum/Shapes/Composition.h +++ b/src/Magnum/Shapes/Composition.h @@ -67,7 +67,7 @@ Result of logical operations on shapes. See @ref shapes for brief introduction. template class MAGNUM_SHAPES_EXPORT Composition { friend Implementation::AbstractShape& Implementation::getAbstractShape<>(Composition&, std::size_t); friend const Implementation::AbstractShape& Implementation::getAbstractShape<>(const Composition&, std::size_t); - friend struct Implementation::ShapeHelper>; + friend Implementation::ShapeHelper>; public: enum: UnsignedInt { diff --git a/src/Magnum/Shapes/Shape.h b/src/Magnum/Shapes/Shape.h index 531157f3f..f4fed39e3 100644 --- a/src/Magnum/Shapes/Shape.h +++ b/src/Magnum/Shapes/Shape.h @@ -67,7 +67,7 @@ Shapes::AbstractShape3D* firstCollision = shapes.firstCollision(shape); @ref DebugTools::ShapeRenderer */ template class Shape: public AbstractShape { - friend struct Implementation::ShapeHelper; + friend Implementation::ShapeHelper; public: /** diff --git a/src/Magnum/Shapes/ShapeGroup.h b/src/Magnum/Shapes/ShapeGroup.h index 83ca485d9..9be3ceb88 100644 --- a/src/Magnum/Shapes/ShapeGroup.h +++ b/src/Magnum/Shapes/ShapeGroup.h @@ -44,7 +44,7 @@ See @ref Shape for more information. See @ref shapes for brief introduction. @see @ref scenegraph, @ref ShapeGroup2D, @ref ShapeGroup3D */ template class MAGNUM_SHAPES_EXPORT ShapeGroup: public SceneGraph::FeatureGroup, Float> { - friend class AbstractShape; + friend AbstractShape; public: /** diff --git a/src/Magnum/TransformFeedback.h b/src/Magnum/TransformFeedback.h index 0caa107c6..5d65a0ee0 100644 --- a/src/Magnum/TransformFeedback.h +++ b/src/Magnum/TransformFeedback.h @@ -61,7 +61,7 @@ documentation for more information. @todo @extension{AMD,transform_feedback3_lines_triangles}? */ class MAGNUM_EXPORT TransformFeedback: public AbstractObject { - friend struct Implementation::TransformFeedbackState; + friend Implementation::TransformFeedbackState; public: /**