diff --git a/include/Nazara/Core/Enums.hpp b/include/Nazara/Core/Enums.hpp index 7ad4f9eeb..734632009 100644 --- a/include/Nazara/Core/Enums.hpp +++ b/include/Nazara/Core/Enums.hpp @@ -27,6 +27,19 @@ enum nzErrorType nzErrorType_Max = nzErrorType_Warning }; +enum nzHash +{ + nzHash_CRC32, + nzHash_Fletcher16, + nzHash_MD5, + nzHash_SHA1, + nzHash_SHA224, + nzHash_SHA256, + nzHash_SHA384, + nzHash_SHA512, + nzHash_Whirlpool +}; + enum nzPlugin { nzPlugin_Assimp, diff --git a/include/Nazara/Core/Hashable.hpp b/include/Nazara/Core/Hashable.hpp index 0492fcd97..63b45b057 100644 --- a/include/Nazara/Core/Hashable.hpp +++ b/include/Nazara/Core/Hashable.hpp @@ -8,19 +8,7 @@ #define HASHABLE_HPP_INCLUDED #include - -enum nzHash -{ - nzHash_CRC32, - nzHash_Fletcher16, - nzHash_MD5, - nzHash_SHA1, - nzHash_SHA224, - nzHash_SHA256, - nzHash_SHA384, - nzHash_SHA512, - nzHash_Whirlpool -}; +#include class NzAbstractHash; class NzHashDigest; diff --git a/include/Nazara/Prerequesites.hpp b/include/Nazara/Prerequesites.hpp index 20b8aa7a6..05cd625c0 100644 --- a/include/Nazara/Prerequesites.hpp +++ b/include/Nazara/Prerequesites.hpp @@ -145,8 +145,8 @@ #endif // Macros supplémentaires -#define NazaraStringifyMacro(s) NazaraStringify(s) // http://gcc.gnu.org/onlinedocs/cpp/Stringification.html#Stringification #define NazaraStringify(s) #s +#define NazaraStringifyMacro(s) NazaraStringify(s) // http://gcc.gnu.org/onlinedocs/cpp/Stringification.html#Stringification #define NazaraUnused(a) (void) a #include diff --git a/src/Nazara/Core/HardwareInfo.cpp b/src/Nazara/Core/HardwareInfo.cpp index d157ecc86..e8eca99cd 100644 --- a/src/Nazara/Core/HardwareInfo.cpp +++ b/src/Nazara/Core/HardwareInfo.cpp @@ -60,11 +60,6 @@ namespace {"Vortex86 SoC", nzProcessorVendor_VIA} }; - bool VendorStringCompare(const VendorString& a, const VendorString& b) - { - return std::memcmp(a.vendor, b.vendor, 12); - } - nzProcessorVendor s_vendorEnum = nzProcessorVendor_Unknown; bool s_capabilities[nzProcessorCap_Max+1] = {false}; bool s_initialized = false; diff --git a/src/Nazara/Core/MemoryStream.cpp b/src/Nazara/Core/MemoryStream.cpp index b78912a00..60234c9de 100644 --- a/src/Nazara/Core/MemoryStream.cpp +++ b/src/Nazara/Core/MemoryStream.cpp @@ -35,7 +35,7 @@ nzUInt64 NzMemoryStream::GetSize() const std::size_t NzMemoryStream::Read(void* buffer, std::size_t size) { - unsigned int readSize = std::min(static_cast(size), m_size-m_pos); + unsigned int readSize = std::min(static_cast(size), static_cast(m_size-m_pos)); std::memcpy(buffer, &m_ptr[m_pos], readSize); m_pos += readSize; diff --git a/src/Nazara/Utility/Win32/VideoModeImpl.cpp b/src/Nazara/Utility/Win32/VideoModeImpl.cpp index 9a47f7cf7..4432b542f 100644 --- a/src/Nazara/Utility/Win32/VideoModeImpl.cpp +++ b/src/Nazara/Utility/Win32/VideoModeImpl.cpp @@ -14,7 +14,7 @@ NzVideoMode NzVideoModeImpl::GetDesktopMode() mode.dmSize = sizeof(DEVMODE); EnumDisplaySettings(nullptr, ENUM_CURRENT_SETTINGS, &mode); - return NzVideoMode(mode.dmPelsWidth, mode.dmPelsHeight, mode.dmBitsPerPel); + return NzVideoMode(mode.dmPelsWidth, mode.dmPelsHeight, static_cast(mode.dmBitsPerPel)); } void NzVideoModeImpl::GetFullscreenModes(std::vector& modes) @@ -23,7 +23,7 @@ void NzVideoModeImpl::GetFullscreenModes(std::vector& modes) win32Mode.dmSize = sizeof(DEVMODE); for (unsigned int i = 0; EnumDisplaySettings(nullptr, i, &win32Mode); ++i) { - NzVideoMode mode(win32Mode.dmPelsWidth, win32Mode.dmPelsHeight, win32Mode.dmBitsPerPel); + NzVideoMode mode(win32Mode.dmPelsWidth, win32Mode.dmPelsHeight, static_cast(win32Mode.dmBitsPerPel)); // Il existe plusieurs modes avec ces trois caractéristques identiques if (std::find(modes.begin(), modes.end(), mode) == modes.end())