sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation 

Former-commit-id: d5ac6bb73615f7c9b068c1de2037dfeddc5c1b45
This commit is contained in:
Lynix 2016-03-02 16:53:20 +01:00
parent ad55ff159b
commit 192fccc634
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/Bitset.inl
View File

@ -913,7 +913,7 @@ namespace Nz
template<typename Block, class Allocator> template<typename Block, class Allocator>
template<bool BadCall> template<bool BadCall>
void* Bitset::Bit::operator&() const void* Bitset<Block, Allocator>::Bit::operator&() const
{ {
// The template is necessary to make it fail only when used // 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"); static_assert(!BadCall, "It is impossible to take the address of a bit in a bitset");

2
include/Nazara/Core/SparsePtr.inl
View File

@ -215,7 +215,7 @@ namespace Nz
*/ */
template<typename T> template<typename T>
T* SparsePtr::operator->() const T* SparsePtr<T>::operator->() const
{ {
return reinterpret_cast<T*>(m_ptr); return reinterpret_cast<T*>(m_ptr);
} }

2
include/Nazara/Math/Matrix4.inl
View File

@ -1786,7 +1786,7 @@ std::ostream& operator<<(std::ostream& out, const Nz::Matrix4<T>& matrix)
*/ */
template<typename T> template<typename T>
Nz::Matrix4<T> operator*(T scale, const Nz::Matrix4& matrix) Nz::Matrix4<T> operator*(T scale, const Nz::Matrix4<T>& matrix)
{ {
return matrix * scale; return matrix * scale;
} }

2
include/Nazara/Math/Vector2.inl
View File

@ -989,7 +989,7 @@ std::ostream& operator<<(std::ostream& out, const Nz::Vector2<T>& vec)
*/ */
template<typename T> template<typename T>
Nz::Vector2<T> operator*(T scale, const Nz::Vector2& vec) Nz::Vector2<T> operator*(T scale, const Nz::Vector2<T>& vec)
{ {
return Nz::Vector2<T>(scale * vec.x, scale * vec.y); return Nz::Vector2<T>(scale * vec.x, scale * vec.y);
} }

2
include/Nazara/Math/Vector3.inl
View File

@ -1300,7 +1300,7 @@ std::ostream& operator<<(std::ostream& out, const Nz::Vector3<T>& vec)
*/ */
template<typename T> template<typename T>
Nz::Vector3<T> operator*(T scale, const Nz::Vector3& vec) Nz::Vector3<T> operator*(T scale, const Nz::Vector3<T>& vec)
{ {
return Nz::Vector3<T>(scale * vec.x, scale * vec.y, scale * vec.z); return Nz::Vector3<T>(scale * vec.x, scale * vec.y, scale * vec.z);
} }

2
include/Nazara/Math/Vector4.inl
View File

@ -1038,7 +1038,7 @@ std::ostream& operator<<(std::ostream& out, const Nz::Vector4<T>& vec)
template<typename T> template<typename T>
Nz::Vector4<T> operator*(T scale, const Nz::Vector4& vec) Nz::Vector4<T> operator*(T scale, const Nz::Vector4<T>& vec)
{ {
return Nz::Vector4<T>(scale * vec.x, scale * vec.y, scale * vec.z, scale * vec.w); return Nz::Vector4<T>(scale * vec.x, scale * vec.y, scale * vec.z, scale * vec.w);
} }