From 192fccc634e4a11f33c568b6495e9535617e8f72 Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 2 Mar 2016 16:53:20 +0100 Subject: [PATCH] Fix compilation Former-commit-id: d5ac6bb73615f7c9b068c1de2037dfeddc5c1b45 --- include/Nazara/Core/Bitset.inl | 2 +- include/Nazara/Core/SparsePtr.inl | 2 +- include/Nazara/Math/Matrix4.inl | 2 +- include/Nazara/Math/Vector2.inl | 2 +- include/Nazara/Math/Vector3.inl | 2 +- include/Nazara/Math/Vector4.inl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/Nazara/Core/Bitset.inl b/include/Nazara/Core/Bitset.inl index 70c1158eb..bf89628f6 100644 --- a/include/Nazara/Core/Bitset.inl +++ b/include/Nazara/Core/Bitset.inl @@ -913,7 +913,7 @@ namespace Nz template template - void* Bitset::Bit::operator&() const + void* Bitset::Bit::operator&() const { // The template is necessary to make it fail only when used static_assert(!BadCall, "It is impossible to take the address of a bit in a bitset"); diff --git a/include/Nazara/Core/SparsePtr.inl b/include/Nazara/Core/SparsePtr.inl index d81c1eac3..166efe751 100644 --- a/include/Nazara/Core/SparsePtr.inl +++ b/include/Nazara/Core/SparsePtr.inl @@ -215,7 +215,7 @@ namespace Nz */ template - T* SparsePtr::operator->() const + T* SparsePtr::operator->() const { return reinterpret_cast(m_ptr); } diff --git a/include/Nazara/Math/Matrix4.inl b/include/Nazara/Math/Matrix4.inl index 935387eba..6d84c241e 100644 --- a/include/Nazara/Math/Matrix4.inl +++ b/include/Nazara/Math/Matrix4.inl @@ -1786,7 +1786,7 @@ std::ostream& operator<<(std::ostream& out, const Nz::Matrix4& matrix) */ template -Nz::Matrix4 operator*(T scale, const Nz::Matrix4& matrix) +Nz::Matrix4 operator*(T scale, const Nz::Matrix4& matrix) { return matrix * scale; } diff --git a/include/Nazara/Math/Vector2.inl b/include/Nazara/Math/Vector2.inl index 45e8d8f5d..6fd58cf38 100644 --- a/include/Nazara/Math/Vector2.inl +++ b/include/Nazara/Math/Vector2.inl @@ -989,7 +989,7 @@ std::ostream& operator<<(std::ostream& out, const Nz::Vector2& vec) */ template -Nz::Vector2 operator*(T scale, const Nz::Vector2& vec) +Nz::Vector2 operator*(T scale, const Nz::Vector2& vec) { return Nz::Vector2(scale * vec.x, scale * vec.y); } diff --git a/include/Nazara/Math/Vector3.inl b/include/Nazara/Math/Vector3.inl index f25fc5ba4..c386f146d 100644 --- a/include/Nazara/Math/Vector3.inl +++ b/include/Nazara/Math/Vector3.inl @@ -1300,7 +1300,7 @@ std::ostream& operator<<(std::ostream& out, const Nz::Vector3& vec) */ template -Nz::Vector3 operator*(T scale, const Nz::Vector3& vec) +Nz::Vector3 operator*(T scale, const Nz::Vector3& vec) { return Nz::Vector3(scale * vec.x, scale * vec.y, scale * vec.z); } diff --git a/include/Nazara/Math/Vector4.inl b/include/Nazara/Math/Vector4.inl index bdf2bd64f..01c771f8f 100644 --- a/include/Nazara/Math/Vector4.inl +++ b/include/Nazara/Math/Vector4.inl @@ -1038,7 +1038,7 @@ std::ostream& operator<<(std::ostream& out, const Nz::Vector4& vec) template -Nz::Vector4 operator*(T scale, const Nz::Vector4& vec) +Nz::Vector4 operator*(T scale, const Nz::Vector4& vec) { return Nz::Vector4(scale * vec.x, scale * vec.y, scale * vec.z, scale * vec.w); }