aboutsummaryrefslogtreecommitdiff
path: root/src/audio_core
diff options
context:
space:
mode:
authorlizzie <lizzie@eden-emu.dev>2026-10-12 22:21:17 +0200
committercrueter <crueter@eden-emu.dev>2026-10-12 22:21:17 +0200
commit4dc69c06f764a235bccd01afbfc765d9ddbebc9f (patch)
tree4ec77f56d6fa8a8c4bfb5a0348c0c88b588566da /src/audio_core
parent9580e54f2f4787986abde4c7601177d0c5cd2792 (diff)
[*] Remove Fix{Static,Small}VectorADL workaround for GCC 12 (#4386)
1. We demand at least, minimum, gcc 14 2. Debian stable boost uses a newer version https://packages.debian.org/trixie/libboost-all-dev, so fix isn't longer required - [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4386 Reviewed-by: MaranBr <maranbr@eden-emu.dev> Reviewed-by: crueter <crueter@eden-emu.dev>
Diffstat (limited to 'src/audio_core')
-rw-r--r--src/audio_core/in/audio_in_system.cpp19
1 files changed, 2 insertions, 17 deletions
diff --git a/src/audio_core/in/audio_in_system.cpp b/src/audio_core/in/audio_in_system.cpp
index f71a2df6be..f8946cc0f6 100644
--- a/src/audio_core/in/audio_in_system.cpp
+++ b/src/audio_core/in/audio_in_system.cpp
@@ -14,21 +14,6 @@
#include "core/core_timing.h"
#include "core/hle/kernel/k_event.h"
-// See texture_cache/util.h
-template<typename T, size_t N>
-#if BOOST_VERSION >= 108100 || __GNUC__ > 12
-[[nodiscard]] boost::container::static_vector<T, N> FixStaticVectorADL(const boost::container::static_vector<T, N>& v) {
- return v;
-}
-#else
-[[nodiscard]] std::vector<T> FixStaticVectorADL(const boost::container::static_vector<T, N>& v) {
- std::vector<T> u;
- for (auto const& e : v)
- u.push_back(e);
- return u;
-}
-#endif
-
namespace AudioCore::AudioIn {
System::System(Core::System& system_, Kernel::KEvent* event_, const size_t session_id_)
@@ -110,7 +95,7 @@ Result System::Start() {
boost::container::static_vector<AudioBuffer, BufferCount> buffers_to_flush{};
buffers.RegisterBuffers(buffers_to_flush);
- session->AppendBuffers(FixStaticVectorADL(buffers_to_flush));
+ session->AppendBuffers(buffers_to_flush);
session->SetRingSize(static_cast<u32>(buffers_to_flush.size()));
return ResultSuccess;
@@ -155,7 +140,7 @@ void System::RegisterBuffers() {
if (state == State::Started) {
boost::container::static_vector<AudioBuffer, BufferCount> registered_buffers{};
buffers.RegisterBuffers(registered_buffers);
- session->AppendBuffers(FixStaticVectorADL(registered_buffers));
+ session->AppendBuffers(registered_buffers);
}
}