From 3a612d865550e22d6cdbb15aeb280b4cd19b160c Mon Sep 17 00:00:00 2001 From: SirLynix Date: Sat, 3 Feb 2024 22:56:58 +0100 Subject: [PATCH] Minor fixes --- .../Components/ChipmunkRigidBody2DComponent.hpp | 4 ++-- include/Nazara/Graphics/PredefinedShaderStructBuilder.inl | 5 +++++ include/Nazara/Math/Frustum.inl | 2 +- include/Nazara/Network/WebRequest.hpp | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/Nazara/ChipmunkPhysics2D/Components/ChipmunkRigidBody2DComponent.hpp b/include/Nazara/ChipmunkPhysics2D/Components/ChipmunkRigidBody2DComponent.hpp index c767b5a9a..1a8d28588 100644 --- a/include/Nazara/ChipmunkPhysics2D/Components/ChipmunkRigidBody2DComponent.hpp +++ b/include/Nazara/ChipmunkPhysics2D/Components/ChipmunkRigidBody2DComponent.hpp @@ -20,11 +20,11 @@ namespace Nz public: inline ChipmunkRigidBody2DComponent(const ChipmunkRigidBody2D::DynamicSettings& settings); inline ChipmunkRigidBody2DComponent(const ChipmunkRigidBody2D::StaticSettings& settings); - ChipmunkRigidBody2DComponent(const ChipmunkRigidBody2DComponent&) = default; + ChipmunkRigidBody2DComponent(const ChipmunkRigidBody2DComponent&) = delete; ChipmunkRigidBody2DComponent(ChipmunkRigidBody2DComponent&&) noexcept = default; ~ChipmunkRigidBody2DComponent() = default; - ChipmunkRigidBody2DComponent& operator=(const ChipmunkRigidBody2DComponent&) = default; + ChipmunkRigidBody2DComponent& operator=(const ChipmunkRigidBody2DComponent&) = delete; ChipmunkRigidBody2DComponent& operator=(ChipmunkRigidBody2DComponent&&) noexcept = default; private: diff --git a/include/Nazara/Graphics/PredefinedShaderStructBuilder.inl b/include/Nazara/Graphics/PredefinedShaderStructBuilder.inl index 01b5879f9..21df91ebc 100644 --- a/include/Nazara/Graphics/PredefinedShaderStructBuilder.inl +++ b/include/Nazara/Graphics/PredefinedShaderStructBuilder.inl @@ -6,6 +6,9 @@ namespace Nz { +NAZARA_WARNING_PUSH() +NAZARA_WARNING_CLANG_GCC_DISABLE("-Wmissing-field-initializers") + // PredefinedDirectionalLightData constexpr PredefinedDirectionalLightData PredefinedDirectionalLightData::Build() { @@ -125,6 +128,8 @@ namespace Nz return viewerData; } + +NAZARA_WARNING_POP() } #include diff --git a/include/Nazara/Math/Frustum.inl b/include/Nazara/Math/Frustum.inl index 250298367..0a145a0a9 100644 --- a/include/Nazara/Math/Frustum.inl +++ b/include/Nazara/Math/Frustum.inl @@ -53,7 +53,7 @@ namespace Nz { for (auto&& [planeEnum, plane] : m_planes.iter_kv()) { - if (!plane.ApproxEqual(frustum.GetPlane(planeEnum))) + if (!plane.ApproxEqual(frustum.GetPlane(planeEnum), maxDifference)) return false; } diff --git a/include/Nazara/Network/WebRequest.hpp b/include/Nazara/Network/WebRequest.hpp index ca143a074..6a5ad8ebe 100644 --- a/include/Nazara/Network/WebRequest.hpp +++ b/include/Nazara/Network/WebRequest.hpp @@ -57,7 +57,7 @@ namespace Nz void SetupPost(); WebRequest& operator=(const WebRequest&) = delete; - WebRequest& operator=(WebRequest&&) = default; + WebRequest& operator=(WebRequest&&) = delete; private: inline bool OnBodyResponse(const char* data, std::size_t length);