mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

FixedSizeFunction: Replace std::aligned_storage_t to avoid C++23 warning

Browse source 
We are ignoring warning 4324, which warns us that a FixedSizeFunction<4>
will have it's size increased to 8 bytes, due to the minimum alignment
requirement of 8 bytes.
This commit is contained in:
attila 2024-07-10 19:25:36 +02:00
parent b7a2c1d3bf
commit 95e71b10b0
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/juce_core/containers/juce_FixedSizeFunction.h
View file

@ -108,14 +108,12 @@ template <size_t len, typename Ret, typename... Args>
class FixedSizeFunction<len, Ret (Args...)> class FixedSizeFunction<len, Ret (Args...)>
{ {
private: private:
using Storage = std::aligned_storage_t<len>;
template <typename Item> template <typename Item>
using Decay = std::decay_t<Item>; using Decay = std::decay_t<Item>;
template <typename Item, typename Fn = Decay<Item>> template <typename Item, typename Fn = Decay<Item>>
using IntIfValidConversion = std::enable_if_t<sizeof (Fn) <= len using IntIfValidConversion = std::enable_if_t<sizeof (Fn) <= len
&& alignof (Fn) <= alignof (Storage) && alignof (Fn) <= alignof (std::max_align_t)
&& ! std::is_same_v<FixedSizeFunction, Fn>, && ! std::is_same_v<FixedSizeFunction, Fn>,
int>; int>;
@ -137,7 +135,7 @@ public:
{ {
static_assert (sizeof (Fn) <= len, static_assert (sizeof (Fn) <= len,
"The requested function cannot fit in this FixedSizeFunction"); "The requested function cannot fit in this FixedSizeFunction");
static_assert (alignof (Fn) <= alignof (Storage), static_assert (alignof (Fn) <= alignof (std::max_align_t),
"FixedSizeFunction cannot accommodate the requested alignment requirements"); "FixedSizeFunction cannot accommodate the requested alignment requirements");
static constexpr auto vtableForCallable = detail::makeVtable<Fn, Ret, Args...>(); static constexpr auto vtableForCallable = detail::makeVtable<Fn, Ret, Args...>();
@ -228,7 +226,10 @@ private:
} }
const detail::Vtable<Ret, Args...>* vtable = nullptr; const detail::Vtable<Ret, Args...>* vtable = nullptr;
mutable Storage storage;
JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4324)
alignas (std::max_align_t) mutable std::byte storage[len];
JUCE_END_IGNORE_WARNINGS_MSVC
}; };
template <size_t len, typename T> template <size_t len, typename T>