From d99d673330fa1b3d37d3dc09a147c6ad45df2c1b Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Tue, 4 Jun 2024 22:38:39 -0600 Subject: [PATCH] Use `std::` namespace --- src/SFML/Audio/AudioDevice.cpp | 2 +- src/SFML/Graphics/Shader.cpp | 4 ++-- src/SFML/Window/Win32/WglContext.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SFML/Audio/AudioDevice.cpp b/src/SFML/Audio/AudioDevice.cpp index 7657d55e0..0d2e0be54 100644 --- a/src/SFML/Audio/AudioDevice.cpp +++ b/src/SFML/Audio/AudioDevice.cpp @@ -508,7 +508,7 @@ bool AudioDevice::initialize() // Update the current device string from the the device we just initialized { std::array deviceName{}; - size_t deviceNameLength{}; + std::size_t deviceNameLength{}; if (const auto result = ma_device_get_name(&*m_playbackDevice, ma_device_type_playback, diff --git a/src/SFML/Graphics/Shader.cpp b/src/SFML/Graphics/Shader.cpp index 7228c9c53..ab9bca871 100644 --- a/src/SFML/Graphics/Shader.cpp +++ b/src/SFML/Graphics/Shader.cpp @@ -52,8 +52,8 @@ #if defined(SFML_SYSTEM_MACOS) || defined(SFML_SYSTEM_IOS) -#define castToGlHandle(x) reinterpret_cast(static_cast(x)) -#define castFromGlHandle(x) static_cast(reinterpret_cast(x)) +#define castToGlHandle(x) reinterpret_cast(static_cast(x)) +#define castFromGlHandle(x) static_cast(reinterpret_cast(x)) #else diff --git a/src/SFML/Window/Win32/WglContext.cpp b/src/SFML/Window/Win32/WglContext.cpp index acd925fe4..e394c0a4f 100644 --- a/src/SFML/Window/Win32/WglContext.cpp +++ b/src/SFML/Window/Win32/WglContext.cpp @@ -214,7 +214,7 @@ GlFunctionPointer WglContext::getFunction(const char* name) if (address) { // Test whether the returned value is a valid error code - auto errorCode = reinterpret_cast(address); + auto errorCode = reinterpret_cast(address); if ((errorCode != -1) && (errorCode != 1) && (errorCode != 2) && (errorCode != 3)) return address;