diff --git a/src/Magnum/Context.cpp b/src/Magnum/Context.cpp index 027b541d1..0e74a549a 100644 --- a/src/Magnum/Context.cpp +++ b/src/Magnum/Context.cpp @@ -453,14 +453,14 @@ Context::Context(NoCreateT, Int argc, const char** argv, void functionLoader()): _disabledExtensions.push_back(extension); } -Context::Context(Context&& other): _version{std::move(other._version)}, +Context::Context(Context&& other): _version{other._version}, #ifndef MAGNUM_TARGET_WEBGL - _flags{std::move(other._flags)}, + _flags{other._flags}, #endif - _extensionRequiredVersion(std::move(other._extensionRequiredVersion)), - _extensionStatus{std::move(other._extensionStatus)}, + _extensionRequiredVersion(other._extensionRequiredVersion), + _extensionStatus{other._extensionStatus}, _supportedExtensions{std::move(other._supportedExtensions)}, - _state{std::move(other._state)}, + _state{other._state}, _detectedDrivers{std::move(other._detectedDrivers)} { other._state = nullptr; diff --git a/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp b/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp index 53a24a557..3dc5a2d4f 100644 --- a/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp +++ b/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp @@ -120,7 +120,7 @@ template AbstractShapeRenderer::AbstractShap new Shaders::Flat, ResourceDataState::Final, ResourcePolicy::Resident); } -template AbstractShapeRenderer::~AbstractShapeRenderer() {} +template AbstractShapeRenderer::~AbstractShapeRenderer() = default; template void AbstractShapeRenderer::createResources(typename MeshData::Type data) { create(data, wireframeMesh, vertexBuffer, indexBuffer); diff --git a/src/Magnum/DebugTools/ResourceManager.cpp b/src/Magnum/DebugTools/ResourceManager.cpp index 3661b3f6f..6dd2e71a7 100644 --- a/src/Magnum/DebugTools/ResourceManager.cpp +++ b/src/Magnum/DebugTools/ResourceManager.cpp @@ -48,6 +48,6 @@ ResourceManager::ResourceManager() { setFallback(new ShapeRendererOptions); } -ResourceManager::~ResourceManager() {} +ResourceManager::~ResourceManager() = default; }} diff --git a/src/Magnum/Text/AbstractFont.cpp b/src/Magnum/Text/AbstractFont.cpp index ade83be3e..861e8e4e5 100644 --- a/src/Magnum/Text/AbstractFont.cpp +++ b/src/Magnum/Text/AbstractFont.cpp @@ -165,7 +165,7 @@ std::unique_ptr AbstractFont::layout(const GlyphCache& cache, AbstractLayouter::AbstractLayouter(UnsignedInt glyphCount): _glyphCount(glyphCount) {} -AbstractLayouter::~AbstractLayouter() {} +AbstractLayouter::~AbstractLayouter() = default; std::pair AbstractLayouter::renderGlyph(const UnsignedInt i, Vector2& cursorPosition, Range2D& rectangle) { CORRADE_ASSERT(i < glyphCount(), "Text::AbstractLayouter::renderGlyph(): glyph index out of bounds", {}); diff --git a/src/Magnum/Text/Renderer.cpp b/src/Magnum/Text/Renderer.cpp index 5a720b7b2..de0e882d6 100644 --- a/src/Magnum/Text/Renderer.cpp +++ b/src/Magnum/Text/Renderer.cpp @@ -330,7 +330,7 @@ AbstractRenderer::AbstractRenderer(AbstractFont& font, const GlyphCache& cache, _mesh.setPrimitive(MeshPrimitive::Triangles); } -AbstractRenderer::~AbstractRenderer() {} +AbstractRenderer::~AbstractRenderer() = default; template Renderer::Renderer(AbstractFont& font, const GlyphCache& cache, const Float size, const Alignment alignment): AbstractRenderer(font, cache, size, alignment) { /* Finalize mesh configuration */ diff --git a/src/Magnum/TextureArray.cpp b/src/Magnum/TextureArray.cpp index 8ed75583d..741eeac2a 100644 --- a/src/Magnum/TextureArray.cpp +++ b/src/Magnum/TextureArray.cpp @@ -40,8 +40,8 @@ namespace Magnum { namespace { template struct VectorOrScalar; - template<> struct VectorOrScalar<1> { typedef Int Type; }; - template<> struct VectorOrScalar<2> { typedef Vector2i Type; }; + template<> struct VectorOrScalar<1> { using Type = Int; }; + template<> struct VectorOrScalar<2> { using Type = Vector2i; }; } template VectorTypeFor TextureArray::maxSize() { diff --git a/src/Magnum/TextureTools/DistanceField.cpp b/src/Magnum/TextureTools/DistanceField.cpp index 3bc85e281..5e5fddd31 100644 --- a/src/Magnum/TextureTools/DistanceField.cpp +++ b/src/Magnum/TextureTools/DistanceField.cpp @@ -77,12 +77,12 @@ class DistanceFieldShader: public AbstractShaderProgram { private: enum: Int { TextureUnit = 8 }; - Int radiusUniform, - scalingUniform, + Int radiusUniform{0}, + scalingUniform{1}, imageSizeInvertedUniform; }; -DistanceFieldShader::DistanceFieldShader(): radiusUniform(0), scalingUniform(1) { +DistanceFieldShader::DistanceFieldShader() { #ifdef MAGNUM_BUILD_STATIC /* Import resources on static build, if not already */ if(!Utility::Resource::hasGroup("MagnumTextureTools")) diff --git a/src/Magnum/Trade/AbstractMaterialData.cpp b/src/Magnum/Trade/AbstractMaterialData.cpp index c8a202232..bb5ce586d 100644 --- a/src/Magnum/Trade/AbstractMaterialData.cpp +++ b/src/Magnum/Trade/AbstractMaterialData.cpp @@ -31,7 +31,7 @@ namespace Magnum { namespace Trade { AbstractMaterialData::AbstractMaterialData(const MaterialType type, const void* const importerState) noexcept: _type{type}, _importerState{importerState} {} -AbstractMaterialData::~AbstractMaterialData() {} +AbstractMaterialData::~AbstractMaterialData() = default; Debug& operator<<(Debug& debug, const MaterialType value) { switch(value) { diff --git a/src/Magnum/Trade/PhongMaterialData.cpp b/src/Magnum/Trade/PhongMaterialData.cpp index 4264dc1c1..0755d7dc4 100644 --- a/src/Magnum/Trade/PhongMaterialData.cpp +++ b/src/Magnum/Trade/PhongMaterialData.cpp @@ -27,7 +27,7 @@ namespace Magnum { namespace Trade { -PhongMaterialData::PhongMaterialData(PhongMaterialData&& other) noexcept: AbstractMaterialData{std::move(other)}, _flags{std::move(other._flags)}, _shininess{std::move(other._shininess)} { +PhongMaterialData::PhongMaterialData(PhongMaterialData&& other) noexcept: AbstractMaterialData{std::move(other)}, _flags{other._flags}, _shininess{other._shininess} { if(_flags & Flag::AmbientTexture) _ambient.texture = other._ambient.texture; else diff --git a/src/Magnum/Version.cpp b/src/Magnum/Version.cpp index 41f9de1fc..0305e1e5c 100644 --- a/src/Magnum/Version.cpp +++ b/src/Magnum/Version.cpp @@ -33,7 +33,7 @@ namespace Magnum { Debug& operator<<(Debug& debug, Version value) { switch(value) { /* LCOV_EXCL_START */ - #define _c(value, string) case Version::value: return debug << string; + #define _c(value, string) case Version::value: return debug << (string); _c(None, "None") #ifndef MAGNUM_TARGET_GLES _c(GL210, "OpenGL 2.1") diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.cpp b/src/MagnumExternal/OpenGL/GL/flextGL.cpp index 80f2cfc35..45e92b822 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGL.cpp +++ b/src/MagnumExternal/OpenGL/GL/flextGL.cpp @@ -30,7 +30,7 @@ FLEXTGL_EXPORT void(APIENTRY *flextglMultiDrawArraysIndirectCountARB)(GLenum, GL FLEXTGL_EXPORT void(APIENTRY *flextglMultiDrawElementsIndirectCountARB)(GLenum, GLenum, GLintptr, GLintptr, GLsizei, GLsizei) = nullptr; /* GL_ARB_robustness */ -FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusARB)(void) = nullptr; +FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusARB)() = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetnCompressedTexImageARB)(GLenum, GLint, GLsizei, void *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetnTexImageARB)(GLenum, GLint, GLenum, GLenum, GLsizei, void *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformdvARB)(GLuint, GLint, GLsizei, GLdouble *) = nullptr; @@ -53,7 +53,7 @@ FLEXTGL_EXPORT void(APIENTRY *flextglLabelObjectEXT)(GLenum, GLuint, GLsizei, co /* GL_EXT_debug_marker */ FLEXTGL_EXPORT void(APIENTRY *flextglInsertEventMarkerEXT)(GLsizei, const GLchar *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglPopGroupMarkerEXT)(void) = nullptr; +FLEXTGL_EXPORT void(APIENTRY *flextglPopGroupMarkerEXT)() = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglPushGroupMarkerEXT)(GLsizei, const GLchar *) = nullptr; /* GL_EXT_direct_state_access */ @@ -317,7 +317,7 @@ FLEXTGL_EXPORT void(APIENTRY *flextglVertexArrayVertexOffsetEXT)(GLuint, GLuint, FLEXTGL_EXPORT void(APIENTRY *flextglStringMarkerGREMEDY)(GLsizei, const void *) = nullptr; /* GL_KHR_blend_equation_advanced */ -FLEXTGL_EXPORT void(APIENTRY *flextglBlendBarrierKHR)(void) = nullptr; +FLEXTGL_EXPORT void(APIENTRY *flextglBlendBarrierKHR)() = nullptr; /* GL_VERSION_1_2 */ FLEXTGL_EXPORT void(APIENTRY *flextglCopyTexSubImage3D)(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei) = nullptr; @@ -373,7 +373,7 @@ FLEXTGL_EXPORT void(APIENTRY *flextglAttachShader)(GLuint, GLuint) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglBindAttribLocation)(GLuint, GLuint, const GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglBlendEquationSeparate)(GLenum, GLenum) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglCompileShader)(GLuint) = nullptr; -FLEXTGL_EXPORT GLuint(APIENTRY *flextglCreateProgram)(void) = nullptr; +FLEXTGL_EXPORT GLuint(APIENTRY *flextglCreateProgram)() = nullptr; FLEXTGL_EXPORT GLuint(APIENTRY *flextglCreateShader)(GLenum) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglDeleteProgram)(GLuint) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglDeleteShader)(GLuint) = nullptr; @@ -493,8 +493,8 @@ FLEXTGL_EXPORT void(APIENTRY *flextglDeleteRenderbuffers)(GLsizei, const GLuint FLEXTGL_EXPORT void(APIENTRY *flextglDeleteVertexArrays)(GLsizei, const GLuint *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglDisablei)(GLenum, GLuint) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglEnablei)(GLenum, GLuint) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglEndConditionalRender)(void) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglEndTransformFeedback)(void) = nullptr; +FLEXTGL_EXPORT void(APIENTRY *flextglEndConditionalRender)() = nullptr; +FLEXTGL_EXPORT void(APIENTRY *flextglEndTransformFeedback)() = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglFlushMappedBufferRange)(GLenum, GLintptr, GLsizeiptr) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglFramebufferRenderbuffer)(GLenum, GLenum, GLenum, GLuint) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglFramebufferTexture1D)(GLenum, GLenum, GLenum, GLuint, GLint) = nullptr; @@ -649,8 +649,8 @@ FLEXTGL_EXPORT GLboolean(APIENTRY *flextglIsTransformFeedback)(GLuint) = nullptr FLEXTGL_EXPORT void(APIENTRY *flextglMinSampleShading)(GLfloat) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglPatchParameterfv)(GLenum, const GLfloat *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglPatchParameteri)(GLenum, GLint) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglPauseTransformFeedback)(void) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglResumeTransformFeedback)(void) = nullptr; +FLEXTGL_EXPORT void(APIENTRY *flextglPauseTransformFeedback)() = nullptr; +FLEXTGL_EXPORT void(APIENTRY *flextglResumeTransformFeedback)() = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglUniform1d)(GLint, GLdouble) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglUniform1dv)(GLint, GLsizei, const GLdouble *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglUniform2d)(GLint, GLdouble, GLdouble) = nullptr; @@ -740,7 +740,7 @@ FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x2dv)(GLuint, GLint, G FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x2fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x3dv)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x3fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglReleaseShaderCompiler)(void) = nullptr; +FLEXTGL_EXPORT void(APIENTRY *flextglReleaseShaderCompiler)() = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglScissorArrayv)(GLuint, GLsizei, const GLint *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglScissorIndexed)(GLuint, GLint, GLint, GLsizei, GLsizei) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglScissorIndexedv)(GLuint, const GLint *) = nullptr; @@ -807,7 +807,7 @@ FLEXTGL_EXPORT void(APIENTRY *flextglMultiDrawArraysIndirect)(GLenum, const void FLEXTGL_EXPORT void(APIENTRY *flextglMultiDrawElementsIndirect)(GLenum, GLenum, const void *, GLsizei, GLsizei) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglObjectLabel)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglObjectPtrLabel)(const void *, GLsizei, const GLchar *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroup)(void) = nullptr; +FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroup)() = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroup)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglShaderStorageBlockBinding)(GLuint, GLuint, GLuint) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglTexBufferRange)(GLenum, GLenum, GLuint, GLintptr, GLsizeiptr) = nullptr; @@ -864,7 +864,7 @@ FLEXTGL_EXPORT void(APIENTRY *flextglFlushMappedNamedBufferRange)(GLuint, GLintp FLEXTGL_EXPORT void(APIENTRY *flextglGenerateTextureMipmap)(GLuint) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetCompressedTextureImage)(GLuint, GLint, GLsizei, void *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetCompressedTextureSubImage)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, void *) = nullptr; -FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatus)(void) = nullptr; +FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatus)() = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetNamedBufferParameteri64v)(GLuint, GLenum, GLint64 *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetNamedBufferParameteriv)(GLuint, GLenum, GLint *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetNamedBufferPointerv)(GLuint, GLenum, void **) = nullptr; @@ -914,7 +914,7 @@ FLEXTGL_EXPORT void(APIENTRY *flextglNamedFramebufferTextureLayer)(GLuint, GLenu FLEXTGL_EXPORT void(APIENTRY *flextglNamedRenderbufferStorage)(GLuint, GLenum, GLsizei, GLsizei) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglNamedRenderbufferStorageMultisample)(GLuint, GLsizei, GLenum, GLsizei, GLsizei) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixels)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglTextureBarrier)(void) = nullptr; +FLEXTGL_EXPORT void(APIENTRY *flextglTextureBarrier)() = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglTextureBuffer)(GLuint, GLenum, GLuint) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglTextureBufferRange)(GLuint, GLenum, GLuint, GLintptr, GLsizeiptr) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglTextureParameterIiv)(GLuint, GLenum, const GLint *) = nullptr; diff --git a/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp b/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp index 9396c4a2b..2cced120e 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp +++ b/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp @@ -34,7 +34,7 @@ void flextGLInit() { flextglMultiDrawElementsIndirectCountARB = reinterpret_cast(loader.load("glMultiDrawElementsIndirectCountARB")); /* GL_ARB_robustness */ - flextglGetGraphicsResetStatusARB = reinterpret_cast(loader.load("glGetGraphicsResetStatusARB")); + flextglGetGraphicsResetStatusARB = reinterpret_cast(loader.load("glGetGraphicsResetStatusARB")); flextglGetnCompressedTexImageARB = reinterpret_cast(loader.load("glGetnCompressedTexImageARB")); flextglGetnTexImageARB = reinterpret_cast(loader.load("glGetnTexImageARB")); flextglGetnUniformdvARB = reinterpret_cast(loader.load("glGetnUniformdvARB")); @@ -57,7 +57,7 @@ void flextGLInit() { /* GL_EXT_debug_marker */ flextglInsertEventMarkerEXT = reinterpret_cast(loader.load("glInsertEventMarkerEXT")); - flextglPopGroupMarkerEXT = reinterpret_cast(loader.load("glPopGroupMarkerEXT")); + flextglPopGroupMarkerEXT = reinterpret_cast(loader.load("glPopGroupMarkerEXT")); flextglPushGroupMarkerEXT = reinterpret_cast(loader.load("glPushGroupMarkerEXT")); /* GL_EXT_direct_state_access */ @@ -321,7 +321,7 @@ void flextGLInit() { flextglStringMarkerGREMEDY = reinterpret_cast(loader.load("glStringMarkerGREMEDY")); /* GL_KHR_blend_equation_advanced */ - flextglBlendBarrierKHR = reinterpret_cast(loader.load("glBlendBarrierKHR")); + flextglBlendBarrierKHR = reinterpret_cast(loader.load("glBlendBarrierKHR")); /* GL_VERSION_1_2 */ flextglCopyTexSubImage3D = reinterpret_cast(loader.load("glCopyTexSubImage3D")); @@ -377,7 +377,7 @@ void flextGLInit() { flextglBindAttribLocation = reinterpret_cast(loader.load("glBindAttribLocation")); flextglBlendEquationSeparate = reinterpret_cast(loader.load("glBlendEquationSeparate")); flextglCompileShader = reinterpret_cast(loader.load("glCompileShader")); - flextglCreateProgram = reinterpret_cast(loader.load("glCreateProgram")); + flextglCreateProgram = reinterpret_cast(loader.load("glCreateProgram")); flextglCreateShader = reinterpret_cast(loader.load("glCreateShader")); flextglDeleteProgram = reinterpret_cast(loader.load("glDeleteProgram")); flextglDeleteShader = reinterpret_cast(loader.load("glDeleteShader")); @@ -497,8 +497,8 @@ void flextGLInit() { flextglDeleteVertexArrays = reinterpret_cast(loader.load("glDeleteVertexArrays")); flextglDisablei = reinterpret_cast(loader.load("glDisablei")); flextglEnablei = reinterpret_cast(loader.load("glEnablei")); - flextglEndConditionalRender = reinterpret_cast(loader.load("glEndConditionalRender")); - flextglEndTransformFeedback = reinterpret_cast(loader.load("glEndTransformFeedback")); + flextglEndConditionalRender = reinterpret_cast(loader.load("glEndConditionalRender")); + flextglEndTransformFeedback = reinterpret_cast(loader.load("glEndTransformFeedback")); flextglFlushMappedBufferRange = reinterpret_cast(loader.load("glFlushMappedBufferRange")); flextglFramebufferRenderbuffer = reinterpret_cast(loader.load("glFramebufferRenderbuffer")); flextglFramebufferTexture1D = reinterpret_cast(loader.load("glFramebufferTexture1D")); @@ -653,8 +653,8 @@ void flextGLInit() { flextglMinSampleShading = reinterpret_cast(loader.load("glMinSampleShading")); flextglPatchParameterfv = reinterpret_cast(loader.load("glPatchParameterfv")); flextglPatchParameteri = reinterpret_cast(loader.load("glPatchParameteri")); - flextglPauseTransformFeedback = reinterpret_cast(loader.load("glPauseTransformFeedback")); - flextglResumeTransformFeedback = reinterpret_cast(loader.load("glResumeTransformFeedback")); + flextglPauseTransformFeedback = reinterpret_cast(loader.load("glPauseTransformFeedback")); + flextglResumeTransformFeedback = reinterpret_cast(loader.load("glResumeTransformFeedback")); flextglUniform1d = reinterpret_cast(loader.load("glUniform1d")); flextglUniform1dv = reinterpret_cast(loader.load("glUniform1dv")); flextglUniform2d = reinterpret_cast(loader.load("glUniform2d")); @@ -744,7 +744,7 @@ void flextGLInit() { flextglProgramUniformMatrix4x2fv = reinterpret_cast(loader.load("glProgramUniformMatrix4x2fv")); flextglProgramUniformMatrix4x3dv = reinterpret_cast(loader.load("glProgramUniformMatrix4x3dv")); flextglProgramUniformMatrix4x3fv = reinterpret_cast(loader.load("glProgramUniformMatrix4x3fv")); - flextglReleaseShaderCompiler = reinterpret_cast(loader.load("glReleaseShaderCompiler")); + flextglReleaseShaderCompiler = reinterpret_cast(loader.load("glReleaseShaderCompiler")); flextglScissorArrayv = reinterpret_cast(loader.load("glScissorArrayv")); flextglScissorIndexed = reinterpret_cast(loader.load("glScissorIndexed")); flextglScissorIndexedv = reinterpret_cast(loader.load("glScissorIndexedv")); @@ -811,7 +811,7 @@ void flextGLInit() { flextglMultiDrawElementsIndirect = reinterpret_cast(loader.load("glMultiDrawElementsIndirect")); flextglObjectLabel = reinterpret_cast(loader.load("glObjectLabel")); flextglObjectPtrLabel = reinterpret_cast(loader.load("glObjectPtrLabel")); - flextglPopDebugGroup = reinterpret_cast(loader.load("glPopDebugGroup")); + flextglPopDebugGroup = reinterpret_cast(loader.load("glPopDebugGroup")); flextglPushDebugGroup = reinterpret_cast(loader.load("glPushDebugGroup")); flextglShaderStorageBlockBinding = reinterpret_cast(loader.load("glShaderStorageBlockBinding")); flextglTexBufferRange = reinterpret_cast(loader.load("glTexBufferRange")); @@ -868,7 +868,7 @@ void flextGLInit() { flextglGenerateTextureMipmap = reinterpret_cast(loader.load("glGenerateTextureMipmap")); flextglGetCompressedTextureImage = reinterpret_cast(loader.load("glGetCompressedTextureImage")); flextglGetCompressedTextureSubImage = reinterpret_cast(loader.load("glGetCompressedTextureSubImage")); - flextglGetGraphicsResetStatus = reinterpret_cast(loader.load("glGetGraphicsResetStatus")); + flextglGetGraphicsResetStatus = reinterpret_cast(loader.load("glGetGraphicsResetStatus")); flextglGetNamedBufferParameteri64v = reinterpret_cast(loader.load("glGetNamedBufferParameteri64v")); flextglGetNamedBufferParameteriv = reinterpret_cast(loader.load("glGetNamedBufferParameteriv")); flextglGetNamedBufferPointerv = reinterpret_cast(loader.load("glGetNamedBufferPointerv")); @@ -918,7 +918,7 @@ void flextGLInit() { flextglNamedRenderbufferStorage = reinterpret_cast(loader.load("glNamedRenderbufferStorage")); flextglNamedRenderbufferStorageMultisample = reinterpret_cast(loader.load("glNamedRenderbufferStorageMultisample")); flextglReadnPixels = reinterpret_cast(loader.load("glReadnPixels")); - flextglTextureBarrier = reinterpret_cast(loader.load("glTextureBarrier")); + flextglTextureBarrier = reinterpret_cast(loader.load("glTextureBarrier")); flextglTextureBuffer = reinterpret_cast(loader.load("glTextureBuffer")); flextglTextureBufferRange = reinterpret_cast(loader.load("glTextureBufferRange")); flextglTextureParameterIiv = reinterpret_cast(loader.load("glTextureParameterIiv")); diff --git a/src/MagnumPlugins/ObjImporter/ObjImporter.cpp b/src/MagnumPlugins/ObjImporter/ObjImporter.cpp index b759fe04d..668c41bac 100644 --- a/src/MagnumPlugins/ObjImporter/ObjImporter.cpp +++ b/src/MagnumPlugins/ObjImporter/ObjImporter.cpp @@ -53,7 +53,7 @@ void ignoreLine(std::istream& in) { in.ignore(std::numeric_limits::max(), '\n'); } -template Math::Vector extractFloatData(std::string str, Float* extra = nullptr) { +template Math::Vector extractFloatData(const std::string& str, Float* extra = nullptr) { std::vector data = Utility::String::splitWithoutEmptyParts(str, ' '); if(data.size() < size || data.size() > size + (extra ? 1 : 0)) { Error() << "Trade::ObjImporter::mesh3D(): invalid float array size";