aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/alcontext.h
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2018-11-26 14:48:26 -0800
committerChris Robinson <[email protected]>2018-11-26 14:48:26 -0800
commit053599b2435844eddcc084414ab9dd1c5ad7ec23 (patch)
treedd041ee64b6d056708ad500f5e6d5b0d144cecc7 /Alc/alcontext.h
parenta6923790fac739f0b98db6c06bc93543b9707556 (diff)
Avoid using the ATOMIC() macro
Diffstat (limited to 'Alc/alcontext.h')
-rw-r--r--Alc/alcontext.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/Alc/alcontext.h b/Alc/alcontext.h
index c6824d78..056d9003 100644
--- a/Alc/alcontext.h
+++ b/Alc/alcontext.h
@@ -71,7 +71,7 @@ struct ALCcontext_struct {
al::vector<ALeffectslotPtr> EffectSlotList;
almtx_t EffectSlotLock;
- ATOMIC(ALenum) LastError{AL_NO_ERROR};
+ std::atomic<ALenum> LastError{AL_NO_ERROR};
DistanceModel mDistanceModel{DistanceModel::Default};
ALboolean SourceDistanceModel{AL_FALSE};
@@ -90,30 +90,30 @@ struct ALCcontext_struct {
* indicates if updates are currently happening).
*/
RefCount UpdateCount{0u};
- ATOMIC(ALenum) HoldUpdates{AL_FALSE};
+ std::atomic<ALenum> HoldUpdates{AL_FALSE};
ALfloat GainBoost{1.0f};
- ATOMIC(ALcontextProps*) Update{nullptr};
+ std::atomic<ALcontextProps*> Update{nullptr};
/* Linked lists of unused property containers, free to use for future
* updates.
*/
- ATOMIC(ALcontextProps*) FreeContextProps{nullptr};
- ATOMIC(ALlistenerProps*) FreeListenerProps{nullptr};
- ATOMIC(ALvoiceProps*) FreeVoiceProps{nullptr};
- ATOMIC(ALeffectslotProps*) FreeEffectslotProps{nullptr};
+ std::atomic<ALcontextProps*> FreeContextProps{nullptr};
+ std::atomic<ALlistenerProps*> FreeListenerProps{nullptr};
+ std::atomic<ALvoiceProps*> FreeVoiceProps{nullptr};
+ std::atomic<ALeffectslotProps*> FreeEffectslotProps{nullptr};
ALvoice **Voices{nullptr};
std::atomic<ALsizei> VoiceCount{0};
ALsizei MaxVoices{0};
- ATOMIC(ALeffectslotArray*) ActiveAuxSlots{nullptr};
+ std::atomic<ALeffectslotArray*> ActiveAuxSlots{nullptr};
std::thread EventThread;
alsem_t EventSem;
ll_ringbuffer *AsyncEvents{nullptr};
- ATOMIC(ALbitfieldSOFT) EnabledEvts{0u};
+ std::atomic<ALbitfieldSOFT> EnabledEvts{0u};
std::mutex EventCbLock;
ALEVENTPROCSOFT EventCb{};
void *EventParam{nullptr};
@@ -124,7 +124,7 @@ struct ALCcontext_struct {
ALCdevice *const Device;
const ALCchar *ExtensionList{nullptr};
- ATOMIC(ALCcontext*) next{nullptr};
+ std::atomic<ALCcontext*> next{nullptr};
ALlistener Listener{};
@@ -199,7 +199,7 @@ struct ALcontextProps {
DistanceModel mDistanceModel;
ALfloat MetersPerUnit;
- ATOMIC(struct ALcontextProps*) next;
+ std::atomic<ALcontextProps*> next;
};
#endif /* ALCONTEXT_H */