summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bx/src/allocator.cpp
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2023-01-04 23:29:18 -0500
committer GitHub <noreply@github.com>2023-01-04 23:29:18 -0500
commit94b1e168b2b97b48b81f7a8f64406b0a6f64184e (patch)
treef57362a0fa01bfe8f0ad75a447c4c9e10bc15756 /3rdparty/bx/src/allocator.cpp
parent5581eaa50a42256242f32569f59ce10d70ddd8c2 (diff)
Revert "Update BGFX, BX and BIMG (#10750)" (#10787)
This reverts commit 5581eaa50a42256242f32569f59ce10d70ddd8c2 due to link failure on macOS.
Diffstat (limited to '3rdparty/bx/src/allocator.cpp')
-rw-r--r--3rdparty/bx/src/allocator.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/3rdparty/bx/src/allocator.cpp b/3rdparty/bx/src/allocator.cpp
index 203631f6009..0bcf2cd43c7 100644
--- a/3rdparty/bx/src/allocator.cpp
+++ b/3rdparty/bx/src/allocator.cpp
@@ -1,8 +1,9 @@
/*
- * Copyright 2010-2022 Branimir Karadzic. All rights reserved.
- * License: https://github.com/bkaradzic/bx/blob/master/LICENSE
+ * Copyright 2010-2021 Branimir Karadzic. All rights reserved.
+ * License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
+#include "bx_p.h"
#include <bx/allocator.h>
#include <malloc.h>
@@ -37,7 +38,7 @@ namespace bx
BX_UNUSED(_file, _line);
_aligned_free(_ptr);
# else
- alignedFree(this, _ptr, _align, _file, _line);
+ bx::alignedFree(this, _ptr, _align, _file, _line);
# endif // BX_
}
@@ -54,7 +55,7 @@ namespace bx
BX_UNUSED(_file, _line);
return _aligned_malloc(_size, _align);
# else
- return alignedAlloc(this, _size, _align, _file, _line);
+ return bx::alignedAlloc(this, _size, _align, _file, _line);
# endif // BX_
}
@@ -67,7 +68,7 @@ namespace bx
BX_UNUSED(_file, _line);
return _aligned_realloc(_ptr, _size, _align);
# else
- return alignedRealloc(this, _ptr, _size, _align, _file, _line);
+ return bx::alignedRealloc(this, _ptr, _size, _align, _file, _line);
# endif // BX_
}