diff options
Diffstat (limited to 'al')
| -rw-r--r-- | al/effect.cpp | 2 | ||||
| -rw-r--r-- | al/source.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/al/effect.cpp b/al/effect.cpp index a4004a40..bb4e9de6 100644 --- a/al/effect.cpp +++ b/al/effect.cpp @@ -140,7 +140,7 @@ const EffectPropsItem *getEffectPropsItemByType(ALenum type) auto iter = std::find_if(std::begin(EffectPropsList), std::end(EffectPropsList), [type](const EffectPropsItem &item) noexcept -> bool { return item.Type == type; }); - return (iter != std::end(EffectPropsList)) ? std::addressof(*iter) : nullptr; + return (iter != std::end(EffectPropsList)) ? al::to_address(iter) : nullptr; } void InitEffectParams(ALeffect *effect, ALenum type) diff --git a/al/source.cpp b/al/source.cpp index 1ebacf5e..5d95ba8a 100644 --- a/al/source.cpp +++ b/al/source.cpp @@ -257,7 +257,7 @@ double GetSourceSecOffset(ALsource *Source, ALCcontext *context, nanoseconds *cl const ALbuffer *BufferFmt{nullptr}; auto BufferList = Source->mQueue.cbegin(); - while(BufferList != Source->mQueue.cend() && std::addressof(*BufferList) != Current) + while(BufferList != Source->mQueue.cend() && al::to_address(BufferList) != Current) { if(!BufferFmt) BufferFmt = BufferList->mBuffer; readPos += int64_t{BufferList->mSampleLen} << MixerFracBits; @@ -306,7 +306,7 @@ double GetSourceOffset(ALsource *Source, ALenum name, ALCcontext *context) const ALbuffer *BufferFmt{nullptr}; auto BufferList = Source->mQueue.cbegin(); - while(BufferList != Source->mQueue.cend() && std::addressof(*BufferList) != Current) + while(BufferList != Source->mQueue.cend() && al::to_address(BufferList) != Current) { if(!BufferFmt) BufferFmt = BufferList->mBuffer; readPos += BufferList->mSampleLen; @@ -3674,7 +3674,7 @@ START_API_FUNC if(NewListStart != 0) { auto iter = source->mQueue.begin() + ptrdiff_t(NewListStart); - (iter-1)->mNext.store(std::addressof(*iter), std::memory_order_release); + (iter-1)->mNext.store(al::to_address(iter), std::memory_order_release); } } END_API_FUNC |