From 907b0ca6ee947737b7cf556b5f0b4fe21af36dd5 Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Mon, 19 Feb 2024 11:08:49 -0700 Subject: [PATCH] Use `std::vector::data` --- src/SFML/Audio/SoundRecorder.cpp | 2 +- src/SFML/System/Buffer.cpp | 2 +- src/SFML/Window/VideoMode.cpp | 2 +- src/SFML/Window/Vulkan.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SFML/Audio/SoundRecorder.cpp b/src/SFML/Audio/SoundRecorder.cpp index fce9bf8..ececd0c 100644 --- a/src/SFML/Audio/SoundRecorder.cpp +++ b/src/SFML/Audio/SoundRecorder.cpp @@ -99,7 +99,7 @@ const char** sfSoundRecorder_getAvailableDevices(size_t* count) if (count) *count = cstringDevices.size(); - return !cstringDevices.empty() ? &cstringDevices[0] : nullptr; + return !cstringDevices.empty() ? cstringDevices.data() : nullptr; } diff --git a/src/SFML/System/Buffer.cpp b/src/SFML/System/Buffer.cpp index 986345e..3c25e21 100644 --- a/src/SFML/System/Buffer.cpp +++ b/src/SFML/System/Buffer.cpp @@ -56,5 +56,5 @@ size_t sfBuffer_getSize(const sfBuffer* buffer) const uint8_t* sfBuffer_getData(const sfBuffer* buffer) { CSFML_CHECK_RETURN(buffer, nullptr); - return !buffer->buffer.empty() ? &buffer->buffer[0] : nullptr; + return !buffer->buffer.empty() ? buffer->buffer.data() : nullptr; } diff --git a/src/SFML/Window/VideoMode.cpp b/src/SFML/Window/VideoMode.cpp index 76a78b6..8f7cef5 100644 --- a/src/SFML/Window/VideoMode.cpp +++ b/src/SFML/Window/VideoMode.cpp @@ -65,7 +65,7 @@ const sfVideoMode* sfVideoMode_getFullscreenModes(size_t* count) if (count) *count = modes.size(); - return !modes.empty() ? &modes[0] : nullptr; + return !modes.empty() ? modes.data() : nullptr; } diff --git a/src/SFML/Window/Vulkan.cpp b/src/SFML/Window/Vulkan.cpp index b963fd1..e48f43f 100644 --- a/src/SFML/Window/Vulkan.cpp +++ b/src/SFML/Window/Vulkan.cpp @@ -55,5 +55,5 @@ const char* const* sfVulkan_getGraphicsRequiredInstanceExtensions(size_t* count) if (count) *count = extensions.size(); - return !extensions.empty() ? &extensions[0] : nullptr; + return !extensions.empty() ? extensions.data() : nullptr; }