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

Fix compilation for GCC 

Former-commit-id: 7c51c59904fa86f952b704d175b09b32640d9395
This commit is contained in:
Lynix 2015-11-28 02:07:56 +01:00
parent 0a0e6d00f7
commit 6bc285cb00
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/Nazara/Core/Algorithm.inl
View File

@ -7,6 +7,7 @@
// Merci aussi à Freedom de siteduzero.com // Merci aussi à Freedom de siteduzero.com
#include <Nazara/Core/AbstractHash.hpp> #include <Nazara/Core/AbstractHash.hpp>
#include <Nazara/Core/ByteArray.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Stream.hpp> #include <Nazara/Core/Stream.hpp>
#include <Nazara/Core/Debug.hpp> #include <Nazara/Core/Debug.hpp>
@ -45,17 +46,17 @@ namespace Nz
return Detail::ApplyImplMethod(object, std::forward<F>(fn), std::forward<Tuple>(t), std::make_index_sequence<tSize>()); return Detail::ApplyImplMethod(object, std::forward<F>(fn), std::forward<Tuple>(t), std::make_index_sequence<tSize>());
} }
template<typename T> template<typename T>
ByteArray ComputeHash(HashType hash, const T& v) ByteArray ComputeHash(HashType hash, const T& v)
{ {
return ComputeHash(AbstractHash::Get(hash).get(), v); return ComputeHash(AbstractHash::Get(hash).get(), v);
} }
template<typename T> template<typename T>
ByteArray ComputeHash(AbstractHash* hash, const T& v) ByteArray ComputeHash(AbstractHash* hash, const T& v)
{ {
hash->Begin(); hash->Begin();
HashAppend(hash, v); HashAppend(hash, v);
return hash->End(); return hash->End();

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

@ -115,7 +115,7 @@ namespace Nz
template<typename T> template<typename T>
float Vector3<T>::GetLengthf() const float Vector3<T>::GetLengthf() const
{ {
return std::sqrt<float>(static_cast<float>(GetSquaredLength())); return std::sqrt(static_cast<float>(GetSquaredLength()));
} }
template<typename T> template<typename T>

1
src/Nazara/Core/Stream.cpp
View File

@ -6,6 +6,7 @@
#include <Nazara/Core/ByteArray.hpp> #include <Nazara/Core/ByteArray.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/String.hpp> #include <Nazara/Core/String.hpp>
#include <cstring>
#include <Nazara/Core/Debug.hpp> #include <Nazara/Core/Debug.hpp>
namespace Nz namespace Nz