Merge branch 'v1.23.1'

Resolved Conflicts:
	CMakeLists.txt

1 files changed, 1 insertions, 12 deletions

diff --git a/common/alstring.h b/common/alstring.h
index 194e54a1..6c5004ee 100644
--- a/common/alstring.h
+++ b/common/alstring.h
@@ -2,22 +2,11 @@
 #define AL_STRING_H
 
 #include <cstddef>
-#include <string>
-
-#include "almalloc.h"
+#include <cstring>
 
 
 namespace al {
 
-template<typename T, typename Tr=std::char_traits<T>>
-using basic_string = std::basic_string<T, Tr, al::allocator<T>>;
-
-using string = basic_string<char>;
-using wstring = basic_string<wchar_t>;
-using u16string = basic_string<char16_t>;
-using u32string = basic_string<char32_t>;
-
-
 /* These would be better served by using a string_view-like span/view with
  * case-insensitive char traits.
  */