TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Restrict RAIIdmem to use on integral types

Browse source 
There are no remaining uses of RAIIdmem on structure types.  Restrict it
to integral types, to remove use of std::is_pod.
This commit is contained in:
Kp 2022-07-02 18:10:45 +00:00
parent a906f13c83
commit e79af7c55f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/include/u_mem.h
View file

@ -95,7 +95,7 @@ static inline void mem_init(void)
template <typename T>
T *MALLOC(T *&r, std::size_t count, const char *var, const char *file, unsigned line)
{
static_assert(std::is_pod<T>::value, "MALLOC cannot allocate non-POD");
static_assert(std::is_integral<T>::value, "MALLOC cannot allocate non-integral");
return r = reinterpret_cast<T *>(mem_malloc(count * sizeof(T), var, file, line));
}
@ -104,7 +104,7 @@ T *MALLOC(T *&r, std::size_t count, const char *var, const char *file, unsigned
template <typename T>
static inline void d_free(T *&ptr)
{
static_assert((std::is_same<T, void>::value || std::is_pod<T>::value), "d_free cannot free non-POD");
static_assert((std::is_same<T, void>::value || std::is_integral<T>::value), "d_free cannot free non-integral");
mem_free(std::exchange(ptr, nullptr));
}
@ -130,7 +130,7 @@ class RAIIdmem : public std::unique_ptr<T, RAIIdmem_deleter<T>>
{
typedef std::unique_ptr<T, RAIIdmem_deleter<T>> base_ptr;
public:
static_assert(std::is_pod<typename base_ptr::element_type>::value, "RAIIdmem cannot manage non-POD");
static_assert(std::is_integral<typename base_ptr::element_type>::value, "RAIIdmem cannot manage non-integral");
using base_ptr::base_ptr;
};