From bfb7a0b6d3717e62462a43d332ab5d73c4153092 Mon Sep 17 00:00:00 2001 From: Zegeri Date: Fri, 12 Oct 2018 16:18:54 +0200 Subject: [PATCH] Reduce the amount of warnings * Inlined pure virtual functions don't make sense. * Use '= delete' to prohibit operators instead of runtime errors. * Fix mistakes in return values. --- src/Include/xrRender/Kinematics.h | 8 ++++---- src/xrGame/CharacterPhysicsSupport.h | 4 +--- src/xrGame/WeaponKnife.h | 4 ++-- src/xrGame/ik/limb.h | 2 +- src/xrGame/invincible_fury.cpp | 1 + src/xrPhysics/MathUtils.h | 2 +- src/xrPhysics/PHMoveStorage.h | 6 +++++- .../tri-colliderknoopc/TriPrimitiveCollideClassDef.h | 2 +- 8 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/Include/xrRender/Kinematics.h b/src/Include/xrRender/Kinematics.h index 79810b8543b..4683c28ac72 100644 --- a/src/Include/xrRender/Kinematics.h +++ b/src/Include/xrRender/Kinematics.h @@ -52,7 +52,7 @@ class IKinematics virtual CInifile* LL_UserData() = 0; virtual accel* LL_Bones() = 0; - virtual ICF CBoneInstance& LL_GetBoneInstance(u16 bone_id) = 0; + virtual CBoneInstance& LL_GetBoneInstance(u16 bone_id) = 0; virtual CBoneData& LL_GetData(u16 bone_id) = 0; @@ -61,10 +61,10 @@ class IKinematics virtual u16 LL_BoneCount() const = 0; virtual u16 LL_VisibleBoneCount() = 0; - virtual ICF Fmatrix& LL_GetTransform(u16 bone_id) = 0; - virtual ICF const Fmatrix& LL_GetTransform(u16 bone_id) const = 0; + virtual Fmatrix& LL_GetTransform(u16 bone_id) = 0; + virtual const Fmatrix& LL_GetTransform(u16 bone_id) const = 0; - virtual ICF Fmatrix& LL_GetTransform_R(u16 bone_id) = 0; + virtual Fmatrix& LL_GetTransform_R(u16 bone_id) = 0; virtual Fobb& LL_GetBox(u16 bone_id) = 0; virtual const Fbox& GetBox() const = 0; virtual void LL_GetBindTransform(xr_vector& matrices) = 0; diff --git a/src/xrGame/CharacterPhysicsSupport.h b/src/xrGame/CharacterPhysicsSupport.h index 09c899b8866..6506b6d0784 100644 --- a/src/xrGame/CharacterPhysicsSupport.h +++ b/src/xrGame/CharacterPhysicsSupport.h @@ -153,9 +153,7 @@ class CCharacterPhysicsSupport : public CPHSkeleton, public CPHDestroyable virtual void on_child_shell_activate(CPhysicsShellHolder* obj); ///////////////////////////////////////////////////////////////// CCharacterPhysicsSupport& operator=(CCharacterPhysicsSupport& /**asup/**/) - { - R_ASSERT2(false, "Can not assign it"); - } + = delete; CCharacterPhysicsSupport(EType atype, CEntityAlive* aentity); virtual ~CCharacterPhysicsSupport(); diff --git a/src/xrGame/WeaponKnife.h b/src/xrGame/WeaponKnife.h index 69064be8723..efc8086bf41 100644 --- a/src/xrGame/WeaponKnife.h +++ b/src/xrGame/WeaponKnife.h @@ -138,7 +138,7 @@ class CWeaponKnife : public CWeapon bool operator()(spartial_base_t::value_type const& left) const; private: - victim_filter& operator=(victim_filter const& copy){}; + victim_filter& operator=(victim_filter const& copy) = delete; u16 m_except_id; CWeaponKnife* m_owner; @@ -155,7 +155,7 @@ class CWeaponKnife : public CWeapon void operator()(spartial_base_t::value_type const& left); private: - best_victim_selector& operator=(best_victim_selector const& copy){}; + best_victim_selector& operator=(best_victim_selector const& copy) = delete; Fvector m_start_pos; float m_min_dist; diff --git a/src/xrGame/ik/limb.h b/src/xrGame/ik/limb.h index 0d05fa39cea..46859fb70a0 100644 --- a/src/xrGame/ik/limb.h +++ b/src/xrGame/ik/limb.h @@ -112,7 +112,7 @@ class Limb int SetGoalPos(const float g[3], const Matrix E, int limits_on); int SetGoal(const Matrix G, int limits_on); float Length() const { return solver.Length(); } - int SetAimGoal(const float goal[3], const float axis[3], float flex_angle) + void SetAimGoal(const float goal[3], const float axis[3], float flex_angle) { solver.SetAimGoal(goal, axis, flex_angle); } diff --git a/src/xrGame/invincible_fury.cpp b/src/xrGame/invincible_fury.cpp index e76bb0caccc..017356d1a8f 100644 --- a/src/xrGame/invincible_fury.cpp +++ b/src/xrGame/invincible_fury.cpp @@ -20,6 +20,7 @@ struct fury_killer { m_killer_name = copy.m_killer_name; m_after_time = copy.m_after_time; + return *this; } bool operator()(shared_str const& killer, shared_str const& victim, kills_store::kill const& kill) diff --git a/src/xrPhysics/MathUtils.h b/src/xrPhysics/MathUtils.h index fbddab26c26..d06ca1ef7e2 100644 --- a/src/xrPhysics/MathUtils.h +++ b/src/xrPhysics/MathUtils.h @@ -444,7 +444,7 @@ struct SInertVal SInertVal(float inert) : inertion(inert) { R_ASSERT(inert > 0.f && inert < 1.f); } IC void new_val(float new_val) { val = inertion * val + (1 - inertion) * new_val; } private: - SInertVal& operator=(SInertVal& v) { R_ASSERT(false); } + SInertVal& operator=(SInertVal& v) = delete; }; IC float DET(const Fmatrix& a) diff --git a/src/xrPhysics/PHMoveStorage.h b/src/xrPhysics/PHMoveStorage.h index 8b623f2f318..dd6992127c0 100644 --- a/src/xrPhysics/PHMoveStorage.h +++ b/src/xrPhysics/PHMoveStorage.h @@ -25,7 +25,11 @@ class CPHPositionsPairs return *this; } - CPHPositionsPairs& operator=(const CPHPositionsPairs& right) { geom = right.geom; } + CPHPositionsPairs& operator=(const CPHPositionsPairs& right) + { + geom = right.geom; + return *this; + } bool operator==(const CPHPositionsPairs& right) const { return geom == right.geom; } bool operator!=(const CPHPositionsPairs& right) const { return geom != right.geom; } }; diff --git a/src/xrPhysics/tri-colliderknoopc/TriPrimitiveCollideClassDef.h b/src/xrPhysics/tri-colliderknoopc/TriPrimitiveCollideClassDef.h index 12d033afa50..7bcfb30ac27 100644 --- a/src/xrPhysics/tri-colliderknoopc/TriPrimitiveCollideClassDef.h +++ b/src/xrPhysics/tri-colliderknoopc/TriPrimitiveCollideClassDef.h @@ -7,7 +7,7 @@ class primitive##Tri \ { \ dcTriListCollider& m_tri_list; \ - primitive##Tri& operator=(primitive##Tri& nx_nado) { ; } \ + primitive##Tri& operator=(primitive##Tri& nx_nado) = delete; \ \ public: \ explicit primitive##Tri(dcTriListCollider& tri_list) : m_tri_list(tri_list){}; \