From dbc09095adc83b0b88b22cd094731b4907cd371b Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Wed, 11 Oct 2023 23:06:36 -0700
Subject: Remove an unnecessary deque with a custom allocator

---
 CMakeLists.txt   |  1 -
 al/source.cpp    |  6 +++---
 al/source.h      |  3 +--
 common/aldeque.h | 16 ----------------
 4 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 common/aldeque.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94c22a52..f08c6aa0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -610,7 +610,6 @@ set(COMMON_OBJS
     common/albit.h
     common/alcomplex.cpp
     common/alcomplex.h
-    common/aldeque.h
     common/alfstream.cpp
     common/alfstream.h
     common/almalloc.cpp
diff --git a/al/source.cpp b/al/source.cpp
index ce256f7a..8ad02321 100644
--- a/al/source.cpp
+++ b/al/source.cpp
@@ -438,7 +438,7 @@ struct VoicePos {
  * using the given offset type and offset. If the offset is out of range,
  * returns an empty optional.
  */
-std::optional<VoicePos> GetSampleOffset(al::deque<ALbufferQueueItem> &BufferList,
+std::optional<VoicePos> GetSampleOffset(std::deque<ALbufferQueueItem> &BufferList,
     ALenum OffsetType, double Offset)
 {
     /* Find the first valid Buffer in the Queue */
@@ -1597,7 +1597,7 @@ NOINLINE void SetProperty(ALsource *const Source, ALCcontext *const Context, con
                     return Context->setError(AL_INVALID_OPERATION,
                         "Setting buffer on playing or paused source %u", Source->id);
             }
-            al::deque<ALbufferQueueItem> oldlist;
+            std::deque<ALbufferQueueItem> oldlist;
             if(values[0])
             {
                 using UT = std::make_unsigned_t<T>;
@@ -1614,7 +1614,7 @@ NOINLINE void SetProperty(ALsource *const Source, ALCcontext *const Context, con
                         "Setting already-set callback buffer %u", buffer->id);
 
                 /* Add the selected buffer to a one-item queue */
-                al::deque<ALbufferQueueItem> newlist;
+                std::deque<ALbufferQueueItem> newlist;
                 newlist.emplace_back();
                 newlist.back().mCallback = buffer->mCallback;
                 newlist.back().mUserData = buffer->mUserData;
diff --git a/al/source.h b/al/source.h
index 2bdeb2a3..95978ec7 100644
--- a/al/source.h
+++ b/al/source.h
@@ -15,7 +15,6 @@
 #include "alc/alu.h"
 #include "alc/context.h"
 #include "alc/inprogext.h"
-#include "aldeque.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "atomic.h"
@@ -139,7 +138,7 @@ struct ALsource {
     ALenum state{AL_INITIAL};
 
     /** Source Buffer Queue head. */
-    al::deque<ALbufferQueueItem> mQueue;
+    std::deque<ALbufferQueueItem> mQueue;
 
     bool mPropsDirty{true};
 
diff --git a/common/aldeque.h b/common/aldeque.h
deleted file mode 100644
index 3f99bf00..00000000
--- a/common/aldeque.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef ALDEQUE_H
-#define ALDEQUE_H
-
-#include <deque>
-
-#include "almalloc.h"
-
-
-namespace al {
-
-template<typename T>
-using deque = std::deque<T, al::allocator<T>>;
-
-} // namespace al
-
-#endif /* ALDEQUE_H */
-- 
cgit v1.2.3