From 5a07bbd001db09efa6256947024b4dd0487fb448 Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 17 Oct 2016 14:46:53 +0200 Subject: [PATCH] Fix a lot of warnings from Clang/GCC --- SDK/include/NDK/Application.inl | 4 ++-- SDK/include/NDK/BaseSystem.inl | 4 ++-- SDK/include/NDK/Components/GraphicsComponent.hpp | 6 +++--- SDK/src/NDK/Components/GraphicsComponent.cpp | 2 -- SDK/src/NDK/Systems/RenderSystem.cpp | 4 ---- include/Nazara/Core/Algorithm.inl | 3 +-- include/Nazara/Core/HandledObject.inl | 2 ++ include/Nazara/Network/IpAddress.inl | 4 ++-- include/Nazara/Network/TcpClient.hpp | 2 +- include/Nazara/Utility/PixelFormat.inl | 4 ++-- src/Nazara/Graphics/DeferredRenderQueue.cpp | 1 - src/Nazara/Graphics/DepthRenderTechnique.cpp | 3 --- src/Nazara/Graphics/ForwardRenderQueue.cpp | 5 ----- src/Nazara/Graphics/ForwardRenderTechnique.cpp | 1 - src/Nazara/Physics2D/RigidBody2D.cpp | 2 +- src/Nazara/Renderer/GLX/ContextImpl.hpp | 2 +- src/Nazara/Utility/Formats/MTLParser.cpp | 2 +- 17 files changed, 18 insertions(+), 33 deletions(-) diff --git a/SDK/include/NDK/Application.inl b/SDK/include/NDK/Application.inl index 2c74acb19..d26a2daa8 100644 --- a/SDK/include/NDK/Application.inl +++ b/SDK/include/NDK/Application.inl @@ -374,8 +374,8 @@ namespace Ndk } inline Application::WindowInfo::WindowInfo(std::unique_ptr&& window) : - window(std::move(window)), - renderTarget(nullptr) + renderTarget(nullptr), + window(std::move(window)) { } #endif diff --git a/SDK/include/NDK/BaseSystem.inl b/SDK/include/NDK/BaseSystem.inl index 1afc242c0..31a0c314e 100644 --- a/SDK/include/NDK/BaseSystem.inl +++ b/SDK/include/NDK/BaseSystem.inl @@ -15,8 +15,8 @@ namespace Ndk */ inline BaseSystem::BaseSystem(SystemIndex systemId) : - m_updateEnabled(true), - m_systemIndex(systemId) + m_systemIndex(systemId), + m_updateEnabled(true) { SetUpdateRate(30); } diff --git a/SDK/include/NDK/Components/GraphicsComponent.hpp b/SDK/include/NDK/Components/GraphicsComponent.hpp index b792cfd69..b536fc154 100644 --- a/SDK/include/NDK/Components/GraphicsComponent.hpp +++ b/SDK/include/NDK/Components/GraphicsComponent.hpp @@ -74,11 +74,11 @@ namespace Ndk } Renderable(Renderable&& renderable) noexcept : + renderableInvalidationSlot(std::move(renderable.renderableInvalidationSlot)), + renderableReleaseSlot(std::move(renderable.renderableReleaseSlot)), data(std::move(renderable.data)), renderable(std::move(renderable.renderable)), - dataUpdated(renderable.dataUpdated), - renderableInvalidationSlot(std::move(renderable.renderableInvalidationSlot)), - renderableReleaseSlot(std::move(renderable.renderableReleaseSlot)) + dataUpdated(renderable.dataUpdated) { } diff --git a/SDK/src/NDK/Components/GraphicsComponent.cpp b/SDK/src/NDK/Components/GraphicsComponent.cpp index e06890c97..954dd2de2 100644 --- a/SDK/src/NDK/Components/GraphicsComponent.cpp +++ b/SDK/src/NDK/Components/GraphicsComponent.cpp @@ -131,8 +131,6 @@ namespace Ndk { NazaraAssert(m_entity && m_entity->HasComponent(), "GraphicsComponent requires NodeComponent"); - Ndk::RenderSystem& renderSystem = m_entity->GetWorld()->GetSystem(); - m_transformMatrix = m_entity->GetComponent().GetTransformMatrix(); m_transformMatrixUpdated = true; } diff --git a/SDK/src/NDK/Systems/RenderSystem.cpp b/SDK/src/NDK/Systems/RenderSystem.cpp index 107676206..e251d9cf5 100644 --- a/SDK/src/NDK/Systems/RenderSystem.cpp +++ b/SDK/src/NDK/Systems/RenderSystem.cpp @@ -147,7 +147,6 @@ namespace Ndk for (const Ndk::EntityHandle& drawable : m_drawables) { GraphicsComponent& graphicsComponent = drawable->GetComponent(); - NodeComponent& drawableNode = drawable->GetComponent(); graphicsComponent.AddToRenderQueue(renderQueue); } @@ -217,7 +216,6 @@ namespace Ndk for (const Ndk::EntityHandle& drawable : m_drawables) { GraphicsComponent& graphicsComponent = drawable->GetComponent(); - NodeComponent& drawableNode = drawable->GetComponent(); graphicsComponent.AddToRenderQueue(renderQueue); } @@ -290,7 +288,6 @@ namespace Ndk for (const Ndk::EntityHandle& drawable : m_drawables) { GraphicsComponent& graphicsComponent = drawable->GetComponent(); - NodeComponent& drawableNode = drawable->GetComponent(); graphicsComponent.AddToRenderQueue(renderQueue); } @@ -318,7 +315,6 @@ namespace Ndk for (const Ndk::EntityHandle& drawable : m_drawables) { GraphicsComponent& graphicsComponent = drawable->GetComponent(); - NodeComponent& drawableNode = drawable->GetComponent(); graphicsComponent.AddToRenderQueue(renderQueue); } diff --git a/include/Nazara/Core/Algorithm.inl b/include/Nazara/Core/Algorithm.inl index 4008f8860..15827144d 100644 --- a/include/Nazara/Core/Algorithm.inl +++ b/include/Nazara/Core/Algorithm.inl @@ -123,9 +123,8 @@ namespace Nz * \see CountOf */ template - constexpr std::size_t CountOf(T(&name)[N]) noexcept + constexpr std::size_t CountOf(T(&)[N]) noexcept { - // NazaraUnused(name); //< Because "body of function is not a return-statement" >.> return N; } diff --git a/include/Nazara/Core/HandledObject.inl b/include/Nazara/Core/HandledObject.inl index 6b4d64c45..43feebcd3 100644 --- a/include/Nazara/Core/HandledObject.inl +++ b/include/Nazara/Core/HandledObject.inl @@ -71,6 +71,8 @@ namespace Nz template HandledObject& HandledObject::operator=(const HandledObject& object) { + NazaraUnused(object); + // Nothing to do return *this; } diff --git a/include/Nazara/Network/IpAddress.inl b/include/Nazara/Network/IpAddress.inl index 2fc9ac2bd..1eaef4341 100644 --- a/include/Nazara/Network/IpAddress.inl +++ b/include/Nazara/Network/IpAddress.inl @@ -56,7 +56,7 @@ namespace Nz */ inline IpAddress::IpAddress(const UInt8& a, const UInt8& b, const UInt8& c, const UInt8& d, UInt16 port) : - IpAddress(IPv4{a, b, c, d}, port) + IpAddress(IPv4{{a, b, c, d}}, port) { } @@ -68,7 +68,7 @@ namespace Nz */ inline IpAddress::IpAddress(const UInt16& a, const UInt16& b, const UInt16& c, const UInt16& d, const UInt16& e, const UInt16& f, const UInt16& g, const UInt16& h, UInt16 port) : - IpAddress(IPv6{a, b, c, d, e, f, g, h}, port) + IpAddress(IPv6{{a, b, c, d, e, f, g, h}}, port) { } diff --git a/include/Nazara/Network/TcpClient.hpp b/include/Nazara/Network/TcpClient.hpp index fda4671f9..0fcedcf39 100644 --- a/include/Nazara/Network/TcpClient.hpp +++ b/include/Nazara/Network/TcpClient.hpp @@ -79,8 +79,8 @@ namespace Nz PendingPacket m_pendingPacket; UInt64 m_keepAliveInterval; UInt64 m_keepAliveTime; - bool m_isLowDelayEnabled; bool m_isKeepAliveEnabled; + bool m_isLowDelayEnabled; }; } diff --git a/include/Nazara/Utility/PixelFormat.inl b/include/Nazara/Utility/PixelFormat.inl index bf827c4c0..4d8676916 100644 --- a/include/Nazara/Utility/PixelFormat.inl +++ b/include/Nazara/Utility/PixelFormat.inl @@ -111,8 +111,8 @@ namespace Nz if (content <= PixelFormatContent_Undefined || content > PixelFormatContent_Max) return false; - std::array*, 4> masks = {&redMask, &greenMask, &blueMask, &alphaMask}; - std::array types = {redType, greenType, blueType, alphaType}; + std::array*, 4> masks = { {&redMask, &greenMask, &blueMask, &alphaMask} }; + std::array types = { {redType, greenType, blueType, alphaType} }; for (unsigned int i = 0; i < 4; ++i) { diff --git a/src/Nazara/Graphics/DeferredRenderQueue.cpp b/src/Nazara/Graphics/DeferredRenderQueue.cpp index b240edcd7..6aecb8a5a 100644 --- a/src/Nazara/Graphics/DeferredRenderQueue.cpp +++ b/src/Nazara/Graphics/DeferredRenderQueue.cpp @@ -282,7 +282,6 @@ namespace Nz { for (auto& pipelinePair : layer.opaqueModels) { - const MaterialPipeline* pipeline = pipelinePair.first; auto& pipelineEntry = pipelinePair.second; if (pipelineEntry.maxInstanceCount > 0) diff --git a/src/Nazara/Graphics/DepthRenderTechnique.cpp b/src/Nazara/Graphics/DepthRenderTechnique.cpp index 46b1c3407..ec57b1553 100644 --- a/src/Nazara/Graphics/DepthRenderTechnique.cpp +++ b/src/Nazara/Graphics/DepthRenderTechnique.cpp @@ -431,7 +431,6 @@ namespace Nz for (auto& matIt : pipelinePair.second.materialMap) { - const Material* material = matIt.first; auto& entry = matIt.second; auto& billboardVector = entry.billboards; @@ -551,9 +550,7 @@ namespace Nz const MeshData& meshData = meshIt.first; auto& meshEntry = meshIt.second; - const Spheref& squaredBoundingSphere = meshEntry.squaredBoundingSphere; std::vector& instances = meshEntry.instances; - if (!instances.empty()) { const IndexBuffer* indexBuffer = meshData.indexBuffer; diff --git a/src/Nazara/Graphics/ForwardRenderQueue.cpp b/src/Nazara/Graphics/ForwardRenderQueue.cpp index 2de6b66e4..b74ffa732 100644 --- a/src/Nazara/Graphics/ForwardRenderQueue.cpp +++ b/src/Nazara/Graphics/ForwardRenderQueue.cpp @@ -542,9 +542,7 @@ namespace Nz auto& overlayMap = matEntry.overlayMap; for (auto& overlayIt : overlayMap) { - const Texture* overlay = overlayIt.first; auto& spriteChainVector = overlayIt.second.spriteChains; - spriteChainVector.clear(); } @@ -563,9 +561,7 @@ namespace Nz { for (auto& materialPair : pipelineEntry.materialMap) { - const Material* material = materialPair.first; auto& matEntry = materialPair.second; - if (matEntry.enabled) { MeshInstanceContainer& meshInstances = matEntry.meshMap; @@ -573,7 +569,6 @@ namespace Nz for (auto& meshIt : meshInstances) { auto& meshEntry = meshIt.second; - meshEntry.instances.clear(); } matEntry.enabled = false; diff --git a/src/Nazara/Graphics/ForwardRenderTechnique.cpp b/src/Nazara/Graphics/ForwardRenderTechnique.cpp index 959ef2f03..8a8973415 100644 --- a/src/Nazara/Graphics/ForwardRenderTechnique.cpp +++ b/src/Nazara/Graphics/ForwardRenderTechnique.cpp @@ -508,7 +508,6 @@ namespace Nz for (auto& matIt : pipelinePair.second.materialMap) { - const Material* material = matIt.first; auto& entry = matIt.second; auto& billboardVector = entry.billboards; diff --git a/src/Nazara/Physics2D/RigidBody2D.cpp b/src/Nazara/Physics2D/RigidBody2D.cpp index 44ad0d933..d47f396e4 100644 --- a/src/Nazara/Physics2D/RigidBody2D.cpp +++ b/src/Nazara/Physics2D/RigidBody2D.cpp @@ -52,8 +52,8 @@ namespace Nz } RigidBody2D::RigidBody2D(RigidBody2D&& object) : - m_geom(std::move(object.m_geom)), m_shapes(std::move(object.m_shapes)), + m_geom(std::move(object.m_geom)), m_handle(object.m_handle), m_world(object.m_world), m_gravityFactor(object.m_gravityFactor), diff --git a/src/Nazara/Renderer/GLX/ContextImpl.hpp b/src/Nazara/Renderer/GLX/ContextImpl.hpp index 40bbd5fc7..7508537d1 100644 --- a/src/Nazara/Renderer/GLX/ContextImpl.hpp +++ b/src/Nazara/Renderer/GLX/ContextImpl.hpp @@ -11,7 +11,7 @@ namespace Nz { - class ContextParameters; + struct ContextParameters; class ContextImpl { diff --git a/src/Nazara/Utility/Formats/MTLParser.cpp b/src/Nazara/Utility/Formats/MTLParser.cpp index b31ee24a9..1bbed892f 100644 --- a/src/Nazara/Utility/Formats/MTLParser.cpp +++ b/src/Nazara/Utility/Formats/MTLParser.cpp @@ -304,7 +304,7 @@ namespace Nz const Material& mat = pair.second; Emit("newmtl "); - EmitLine(pair.first); + EmitLine(matName); EmitLine(); Emit("Ka ");