diff options
| -rw-r--r-- | OpenAL32/alAuxEffectSlot.cpp | 6 | ||||
| -rw-r--r-- | native-tools/bsincgen.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenAL32/alAuxEffectSlot.cpp b/OpenAL32/alAuxEffectSlot.cpp index 18bad2d4..0ebcd3c9 100644 --- a/OpenAL32/alAuxEffectSlot.cpp +++ b/OpenAL32/alAuxEffectSlot.cpp @@ -624,7 +624,8 @@ static void AddActiveEffectSlots(const ALuint *slotids, ALsizei count, ALCcontex newarray->count = newcount; } - curarray = ATOMIC_EXCHANGE_PTR(&context->ActiveAuxSlots, newarray, almemory_order_acq_rel); + curarray = static_cast<ALeffectslotArray*>(ATOMIC_EXCHANGE_PTR(&context->ActiveAuxSlots, + newarray, almemory_order_acq_rel)); while((ATOMIC_LOAD(&device->MixCount, almemory_order_acquire)&1)) althrd_yield(); al_free(curarray); @@ -659,7 +660,8 @@ static void RemoveActiveEffectSlots(const ALuint *slotids, ALsizei count, ALCcon /* TODO: Could reallocate newarray now that we know it's needed size. */ - curarray = ATOMIC_EXCHANGE_PTR(&context->ActiveAuxSlots, newarray, almemory_order_acq_rel); + curarray = static_cast<ALeffectslotArray*>(ATOMIC_EXCHANGE_PTR(&context->ActiveAuxSlots, + newarray, almemory_order_acq_rel)); while((ATOMIC_LOAD(&device->MixCount, almemory_order_acquire)&1)) althrd_yield(); al_free(curarray); diff --git a/native-tools/bsincgen.c b/native-tools/bsincgen.c index 4e85135b..89f9f378 100644 --- a/native-tools/bsincgen.c +++ b/native-tools/bsincgen.c @@ -261,7 +261,7 @@ static void BsiGenerateTables(FILE *output, const char *tabname, const double re " * width) suffers to reduce the CPU cost. The bandlimiting will cut all sound\n"
" * after downsampling by ~%.2f octaves.\n"
" */\n"
-"alignas(16) constexpr float %s_tab[%d] = {\n",
+"alignas(16) static constexpr float %s_tab[%d] = {\n",
order, (((order%100)/10) == 1) ? "th" :
((order%10) == 1) ? "st" :
((order%10) == 2) ? "nd" :
@@ -290,7 +290,7 @@ static void BsiGenerateTables(FILE *output, const char *tabname, const double re fprintf(output, "\n");
}
}
- fprintf(output, "};\nconstexpr BSincTable %s = {\n", tabname);
+ fprintf(output, "};\nconst BSincTable %s = {\n", tabname);
/* The scaleBase is calculated from the Kaiser window transition width.
It represents the absolute limit to the filter before it fully cuts
|