diff options
| -rw-r--r-- | al/buffer.h | 2 | ||||
| -rw-r--r-- | al/effect.h | 2 | ||||
| -rw-r--r-- | al/filter.h | 2 | ||||
| -rw-r--r-- | al/listener.h | 2 | ||||
| -rw-r--r-- | al/source.h | 4 | ||||
| -rw-r--r-- | common/almalloc.h | 10 | ||||
| -rw-r--r-- | common/flexarray.h | 2 | ||||
| -rw-r--r-- | core/device.h | 2 | ||||
| -rw-r--r-- | core/hrtf.h | 2 | ||||
| -rw-r--r-- | core/mastering.h | 2 |
10 files changed, 15 insertions, 15 deletions
diff --git a/al/buffer.h b/al/buffer.h index cb864aff..2bcab6cf 100644 --- a/al/buffer.h +++ b/al/buffer.h @@ -50,7 +50,7 @@ struct ALbuffer : public BufferStorage { static void SetName(ALCcontext *context, ALuint id, std::string_view name); - DISABLE_ALLOC() + DISABLE_ALLOC #ifdef ALSOFT_EAX EaxStorage eax_x_ram_mode{EaxStorage::Automatic}; diff --git a/al/effect.h b/al/effect.h index fef03475..71fe9c87 100644 --- a/al/effect.h +++ b/al/effect.h @@ -54,7 +54,7 @@ struct ALeffect { static void SetName(ALCcontext *context, ALuint id, std::string_view name); - DISABLE_ALLOC() + DISABLE_ALLOC }; void InitEffect(ALeffect *effect); diff --git a/al/filter.h b/al/filter.h index 505900d4..b87e7f03 100644 --- a/al/filter.h +++ b/al/filter.h @@ -51,7 +51,7 @@ struct ALfilter { static void SetName(ALCcontext *context, ALuint id, std::string_view name); - DISABLE_ALLOC() + DISABLE_ALLOC }; #endif diff --git a/al/listener.h b/al/listener.h index 81532877..a50f118a 100644 --- a/al/listener.h +++ b/al/listener.h @@ -18,7 +18,7 @@ struct ALlistener { float Gain{1.0f}; float mMetersPerUnit{AL_DEFAULT_METERS_PER_UNIT}; - DISABLE_ALLOC() + DISABLE_ALLOC }; #endif diff --git a/al/source.h b/al/source.h index 3fd43a5c..69bedda3 100644 --- a/al/source.h +++ b/al/source.h @@ -46,7 +46,7 @@ inline bool sBufferSubDataCompat{false}; struct ALbufferQueueItem : public VoiceBufferItem { ALbuffer *mBuffer{nullptr}; - DISABLE_ALLOC() + DISABLE_ALLOC }; @@ -159,7 +159,7 @@ struct ALsource { static void SetName(ALCcontext *context, ALuint id, std::string_view name); - DISABLE_ALLOC() + DISABLE_ALLOC #ifdef ALSOFT_EAX public: diff --git a/common/almalloc.h b/common/almalloc.h index 8a976aae..b3d8dd58 100644 --- a/common/almalloc.h +++ b/common/almalloc.h @@ -20,7 +20,7 @@ void *al_malloc(size_t alignment, size_t size); void *al_calloc(size_t alignment, size_t size); -#define DISABLE_ALLOC() \ +#define DISABLE_ALLOC \ void *operator new(size_t) = delete; \ void *operator new[](size_t) = delete; \ void operator delete(void*) noexcept = delete; \ @@ -39,9 +39,9 @@ void *al_calloc(size_t alignment, size_t size); void operator delete(void *block) noexcept { al_free(block); } \ void operator delete[](void *block) noexcept { operator delete(block); } -#define DEF_PLACE_NEWDEL() \ - void *operator new(size_t /*size*/, void *ptr) noexcept { return ptr; } \ - void *operator new[](size_t /*size*/, void *ptr) noexcept { return ptr; } \ +#define DEF_PLACE_NEWDEL \ + void *operator new(size_t) = delete; \ + void *operator new[](size_t) = delete; \ void operator delete(void *block, void*) noexcept { al_free(block); } \ void operator delete(void *block) noexcept { al_free(block); } \ void operator delete[](void *block, void*) noexcept { al_free(block); } \ @@ -65,7 +65,7 @@ enum FamCount : size_t { }; throw std::bad_alloc(); \ } \ void *operator new[](size_t /*size*/) = delete; \ - void operator delete(void *block, FamCount) { al_free(block); } \ + void operator delete(void *block, FamCount) noexcept { al_free(block); } \ void operator delete(void *block) noexcept { al_free(block); } \ void operator delete[](void* /*block*/) = delete; diff --git a/common/flexarray.h b/common/flexarray.h index d02a7342..c317bfbe 100644 --- a/common/flexarray.h +++ b/common/flexarray.h @@ -105,7 +105,7 @@ struct FlexArray { [[nodiscard]] auto rend() const noexcept -> const_reverse_iterator { return begin(); } [[nodiscard]] auto crend() const noexcept -> const_reverse_iterator { return cbegin(); } - DEF_PLACE_NEWDEL() + DEF_PLACE_NEWDEL }; } // namespace al diff --git a/core/device.h b/core/device.h index 668779fa..93d64aef 100644 --- a/core/device.h +++ b/core/device.h @@ -380,7 +380,7 @@ struct DeviceBase { [[nodiscard]] auto channelIdxByName(Channel chan) const noexcept -> uint8_t { return RealOut.ChannelIndex[chan]; } - DISABLE_ALLOC() + DISABLE_ALLOC private: uint renderSamples(const uint numSamples); diff --git a/core/hrtf.h b/core/hrtf.h index c5dc6475..e0263493 100644 --- a/core/hrtf.h +++ b/core/hrtf.h @@ -47,7 +47,7 @@ struct HrtfStore { void add_ref(); void dec_ref(); - DEF_PLACE_NEWDEL() + DEF_PLACE_NEWDEL }; using HrtfStorePtr = al::intrusive_ptr<HrtfStore>; diff --git a/core/mastering.h b/core/mastering.h index 0d4f5fa1..35480176 100644 --- a/core/mastering.h +++ b/core/mastering.h @@ -66,7 +66,7 @@ struct Compressor { void process(const uint SamplesToDo, FloatBufferLine *OutBuffer); [[nodiscard]] auto getLookAhead() const noexcept -> int { return static_cast<int>(mLookAhead); } - DEF_PLACE_NEWDEL() + DEF_PLACE_NEWDEL /** * The compressor is initialized with the following settings: |