etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-10 22:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

util-memory: Don't use _dbg versions for aligned_alloc/free

Browse source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2018-04-09 13:27:51 +02:00
parent 5e9f113553
commit 9f91039ca0
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/util-memory.cpp
View file

@ -24,11 +24,7 @@
void* util::malloc_aligned(size_t align, size_t size) { void* util::malloc_aligned(size_t align, size_t size) {
#ifdef USE_STD_ALLOC_FREE #ifdef USE_STD_ALLOC_FREE
#if defined(_MSC_VER) #if defined(_MSC_VER)
#ifdef DEBUG
return _aligned_malloc_dbg(size, align);
#else
return _aligned_malloc(size, align); return _aligned_malloc(size, align);
#endif
#else #else
return aligned_malloc(align, size); return aligned_malloc(align, size);
#endif #endif
@ -53,11 +49,7 @@ void* util::malloc_aligned(size_t align, size_t size) {
void util::free_aligned(void* mem) { void util::free_aligned(void* mem) {
#ifdef USE_STD_ALLOC_FREE #ifdef USE_STD_ALLOC_FREE
#if defined(_MSC_VER) #if defined(_MSC_VER)
#ifdef DEBUG
_aligned_free_dbg(mem);
#else
_aligned_free(mem); _aligned_free(mem);
#endif
#else #else
free(mem); free(mem);
#endif #endif