From 5cd9f6fdcdc9f01bda6e73ccad585476b7a47fa4 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sat, 2 Apr 2022 21:18:04 +0200
Subject: [PATCH] Minor fixes

---
 include/Nazara/Network/ENetHost.inl     |  2 +-
 src/Nazara/Audio/OpenALBuffer.cpp       |  2 +-
 src/Nazara/Core/Uuid.cpp                |  2 +-
 src/Nazara/Network/Posix/SocketImpl.cpp | 10 +++++-----
 src/Nazara/Network/Win32/SocketImpl.cpp |  8 ++++----
 src/Nazara/VulkanRenderer/Vulkan.cpp    |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/Nazara/Network/ENetHost.inl b/include/Nazara/Network/ENetHost.inl
index 74ff87e50..472fe95a2 100644
--- a/include/Nazara/Network/ENetHost.inl
+++ b/include/Nazara/Network/ENetHost.inl
@@ -44,7 +44,7 @@ namespace Nz
 
 			case NetProtocol::Any:
 				m_isUsingDualStack = true;
-				// fallthrough
+				[[fallthrough]];
 			case NetProtocol::IPv6:
 				any = IpAddress::AnyIpV6;
 				break;
diff --git a/src/Nazara/Audio/OpenALBuffer.cpp b/src/Nazara/Audio/OpenALBuffer.cpp
index f4bc1b542..fc20a4887 100644
--- a/src/Nazara/Audio/OpenALBuffer.cpp
+++ b/src/Nazara/Audio/OpenALBuffer.cpp
@@ -49,7 +49,7 @@ namespace Nz
 		ALint sampleRate;
 		m_library.alGetBufferi(m_bufferId, AL_FREQUENCY, &sampleRate);
 
-		return SafeCast<UInt64>(sampleRate);
+		return SafeCast<UInt32>(sampleRate);
 	}
 
 	bool OpenALBuffer::IsCompatibleWith(const AudioDevice& device) const
diff --git a/src/Nazara/Core/Uuid.cpp b/src/Nazara/Core/Uuid.cpp
index 287d64df2..7be2ff6d7 100644
--- a/src/Nazara/Core/Uuid.cpp
+++ b/src/Nazara/Core/Uuid.cpp
@@ -21,7 +21,7 @@ namespace Nz
 		{
 			number = 0;
 
-			for (UInt8 mul : { 0x10, 1 })
+			for (UInt8 mul : { UInt8(0x10), UInt8(1) })
 			{
 				if (*str >= '0' && *str <= '9')
 					number += (*str - '0') * mul;
diff --git a/src/Nazara/Network/Posix/SocketImpl.cpp b/src/Nazara/Network/Posix/SocketImpl.cpp
index 5ef5a76cd..f9ae97c1d 100644
--- a/src/Nazara/Network/Posix/SocketImpl.cpp
+++ b/src/Nazara/Network/Posix/SocketImpl.cpp
@@ -30,7 +30,7 @@ namespace Nz
 		NazaraAssert(handle != InvalidHandle, "Invalid handle");
 
 		IpAddressImpl::SockAddrBuffer nameBuffer;
-		std::fill(nameBuffer.begin(), nameBuffer.end(), 0);
+		nameBuffer.fill(0);
 
 		socklen_t bufferLength = sizeof(sockaddr_in);
 
@@ -314,7 +314,7 @@ namespace Nz
 		NazaraAssert(handle != InvalidHandle, "Invalid handle");
 
 		IpAddressImpl::SockAddrBuffer nameBuffer;
-		std::fill(nameBuffer.begin(), nameBuffer.end(), 0);
+		nameBuffer.fill(0);
 
 		socklen_t bufferLength = sizeof(nameBuffer.size());
 
@@ -356,7 +356,7 @@ namespace Nz
 		NazaraAssert(handle != InvalidHandle, "Invalid handle");
 
 		IpAddressImpl::SockAddrBuffer nameBuffer;
-		std::fill(nameBuffer.begin(), nameBuffer.end(), 0);
+		nameBuffer.fill(0);
 
 		socklen_t bufferLength = sizeof(sockaddr_in);
 
@@ -502,7 +502,7 @@ namespace Nz
 		NazaraAssert(buffer && length > 0, "Invalid buffer");
 
 		IpAddressImpl::SockAddrBuffer nameBuffer;
-		std::fill(nameBuffer.begin(), nameBuffer.end(), 0);
+		nameBuffer.fill(0);
 
 		socklen_t bufferLength = static_cast<socklen_t>(nameBuffer.size());
 
@@ -575,7 +575,7 @@ namespace Nz
 		msgHdr.msg_iovlen = static_cast<int>(bufferCount);
 
 		IpAddressImpl::SockAddrBuffer nameBuffer;
-		std::fill(nameBuffer.begin(), nameBuffer.end(), 0);
+		nameBuffer.fill(0);
 
 		if (from)
 		{
diff --git a/src/Nazara/Network/Win32/SocketImpl.cpp b/src/Nazara/Network/Win32/SocketImpl.cpp
index 31fd98831..f85ae7242 100644
--- a/src/Nazara/Network/Win32/SocketImpl.cpp
+++ b/src/Nazara/Network/Win32/SocketImpl.cpp
@@ -346,7 +346,7 @@ namespace Nz
 		NazaraAssert(handle != InvalidHandle, "Invalid handle");
 
 		IpAddressImpl::SockAddrBuffer nameBuffer;
-		std::fill(nameBuffer.begin(), nameBuffer.end(), 0);
+		nameBuffer.fill(0);
 
 		int bufferLength = static_cast<int>(nameBuffer.size());
 
@@ -369,7 +369,7 @@ namespace Nz
 		NazaraAssert(handle != InvalidHandle, "Invalid handle");
 
 		IpAddressImpl::SockAddrBuffer nameBuffer;
-		std::fill(nameBuffer.begin(), nameBuffer.end(), 0);
+		nameBuffer.fill(0);
 
 		int bufferLength = static_cast<int>(nameBuffer.size());
 
@@ -545,7 +545,7 @@ namespace Nz
 		NazaraAssert(buffer && length > 0, "Invalid buffer");
 
 		IpAddressImpl::SockAddrBuffer nameBuffer;
-		std::fill(nameBuffer.begin(), nameBuffer.end(), 0);
+		nameBuffer.fill(0);
 
 		int bufferLength = static_cast<int>(nameBuffer.size());
 
@@ -602,7 +602,7 @@ namespace Nz
 		NazaraAssert(buffers && bufferCount > 0, "Invalid buffers");
 
 		IpAddressImpl::SockAddrBuffer nameBuffer;
-		std::fill(nameBuffer.begin(), nameBuffer.end(), 0);
+		nameBuffer.fill(0);
 
 		int bufferLength = static_cast<int>(nameBuffer.size());
 
diff --git a/src/Nazara/VulkanRenderer/Vulkan.cpp b/src/Nazara/VulkanRenderer/Vulkan.cpp
index a2523529e..48407f42b 100644
--- a/src/Nazara/VulkanRenderer/Vulkan.cpp
+++ b/src/Nazara/VulkanRenderer/Vulkan.cpp
@@ -79,7 +79,7 @@ namespace Nz
 
 			default:
 				NazaraWarning("Device " + deviceInfo.name + " has handled device type (0x" + NumberToString(physDevice.properties.deviceType, 16) + ')');
-				// fallthrough
+				[[fallthrough]];
 			case VK_PHYSICAL_DEVICE_TYPE_OTHER:
 				deviceInfo.type = RenderDeviceType::Unknown;
 				break;