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

Remove unused CALLOC code

Browse source 
TGA generation was the last user of CALLOC.  Remove it.
This commit is contained in:
Kp 2022-07-02 18:10:45 +00:00
parent d586fe91e4
commit fd7ab4388c
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
common/include/u_mem.h
View file

@ -99,13 +99,6 @@ T *MALLOC(T *&r, std::size_t count, const char *var, const char *file, unsigned
return r = reinterpret_cast<T *>(mem_malloc(count * sizeof(T), var, file, line));
}
template <typename T>
T *CALLOC(T *&r, std::size_t count, const char *var, const char *file, unsigned line)
{
static_assert(std::is_pod<T>::value, "CALLOC cannot allocate non-POD");
return r = reinterpret_cast<T *>(mem_calloc(count, sizeof(T), var, file, line));
}
#define d_malloc(size) mem_malloc((size),"Unknown", __FILE__,__LINE__ )
#define d_realloc(ptr,size) mem_realloc((ptr),(size),"Unknown", __FILE__,__LINE__ )
template <typename T>
@ -158,15 +151,7 @@ RAIIdmem<T> &MALLOC(RAIIdmem<T> &r, std::size_t count, const char *var, const ch
return r.reset(MALLOC<typename RAIIdmem<T>::element_type>(p, count, var, file, line)), r;
}
template <typename T>
void CALLOC(RAIIdmem<T> &r, std::size_t count, const char *var, const char *file, unsigned line)
{
typename RAIIdmem<T>::pointer p;
r.reset(CALLOC<typename RAIIdmem<T>::element_type>(p, count, var, file, line));
}
#define MALLOC( var, type, count ) (MALLOC<type>(var, (count),#var, __FILE__,__LINE__ ))
#define CALLOC( var, type, count ) (CALLOC<type>(var, (count),#var, __FILE__,__LINE__ ))
}