Rename ALCdevice_struct and ALCcontext_struct

A (possibly contentious?) change in the public headers. Those names were never
part of any specification, and I don't know why the struct names differed from
the actual type name. But with C++, which takes the original struct declaration
as the original name, it was affecting the type's internal symbols.

This shouldn't affect user code since ALCdevice_struct and ALCcontext_struct
were never part of the spec. If issues arise from this change, it should be
reported.

2 files changed, 11 insertions, 13 deletions

diff --git a/Alc/alc.cpp b/Alc/alc.cpp
index b69c4756..a8288acb 100644
--- a/Alc/alc.cpp
+++ b/Alc/alc.cpp
@@ -2189,17 +2189,16 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
 }
 
 
-ALCdevice_struct::ALCdevice_struct(DeviceType type)
-  : Type{type}
+ALCdevice::ALCdevice(DeviceType type) : Type{type}
 {
 }
 
-/* ALCdevice_struct::~ALCdevice_struct
+/* ALCdevice::~ALCdevice
  *
  * Frees the device structure, and destroys any objects the app failed to
  * delete. Called once there's no more references on the device.
  */
-ALCdevice_struct::~ALCdevice_struct()
+ALCdevice::~ALCdevice()
 {
     TRACE("%p\n", this);
 
@@ -2311,8 +2310,7 @@ static DeviceRef VerifyDevice(ALCdevice *device)
 }
 
 
-ALCcontext_struct::ALCcontext_struct(ALCdevice *device)
-  : Device{device}
+ALCcontext::ALCcontext(ALCdevice *device) : Device{device}
 {
 }
 
@@ -2373,12 +2371,12 @@ static ALvoid InitContext(ALCcontext *Context)
 }
 
 
-/* ALCcontext_struct::~ALCcontext_struct()
+/* ALCcontext::~ALCcontext()
  *
  * Cleans up the context, and destroys any remaining objects the app failed to
  * delete. Called once there's no more references on the context.
  */
-ALCcontext_struct::~ALCcontext_struct()
+ALCcontext::~ALCcontext()
 {
     TRACE("%p\n", this);
 
diff --git a/Alc/alcontext.h b/Alc/alcontext.h
index f843809b..77ba8910 100644
--- a/Alc/alcontext.h
+++ b/Alc/alcontext.h
@@ -61,7 +61,7 @@ struct SourceSubList {
  */
 using ALeffectslotPtr = std::unique_ptr<ALeffectslot>;
 
-struct ALCcontext_struct {
+struct ALCcontext {
     RefCount ref{1u};
 
     al::vector<SourceSubList> SourceList;
@@ -129,10 +129,10 @@ struct ALCcontext_struct {
     ALlistener Listener{};
 
 
-    ALCcontext_struct(ALCdevice *device);
-    ALCcontext_struct(const ALCcontext_struct&) = delete;
-    ALCcontext_struct& operator=(const ALCcontext_struct&) = delete;
-    ~ALCcontext_struct();
+    ALCcontext(ALCdevice *device);
+    ALCcontext(const ALCcontext&) = delete;
+    ALCcontext& operator=(const ALCcontext&) = delete;
+    ~ALCcontext();
 
     DEF_NEWDEL(ALCcontext)
 };