aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2021-04-24 11:50:49 -0700
committerChris Robinson <[email protected]>2021-04-24 11:50:49 -0700
commitfc7d55be4b468c14c2f99d112a56b6c831c7244b (patch)
treeeb7af05d004b76872c49546188a9fa31c4f7d013
parente0e4a8c35d41a4b087a1afbebd38960c96398b7f (diff)
Don't bother with al string types
-rw-r--r--alc/alc.cpp6
-rw-r--r--common/alstring.h13
2 files changed, 3 insertions, 16 deletions
diff --git a/alc/alc.cpp b/alc/alc.cpp
index 87c8bbf4..bd637f8a 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -856,8 +856,8 @@ std::string alcAllDevicesList;
std::string alcCaptureDeviceList;
/* Default is always the first in the list */
-al::string alcDefaultAllDevicesSpecifier;
-al::string alcCaptureDefaultDeviceSpecifier;
+std::string alcDefaultAllDevicesSpecifier;
+std::string alcCaptureDefaultDeviceSpecifier;
/* Default context extensions */
constexpr ALchar alExtList[] =
@@ -1028,7 +1028,7 @@ void alc_initconfig(void)
TRACE("Initializing library v%s-%s %s\n", ALSOFT_VERSION, ALSOFT_GIT_COMMIT_HASH,
ALSOFT_GIT_BRANCH);
{
- al::string names;
+ std::string names;
if(al::size(BackendList) < 1)
names = "(none)";
else
diff --git a/common/alstring.h b/common/alstring.h
index 6c497190..f5127aed 100644
--- a/common/alstring.h
+++ b/common/alstring.h
@@ -2,23 +2,10 @@
#define AL_STRING_H
#include <cstddef>
-#include <cstring>
-#include <string>
-
-#include "almalloc.h"
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.
*/