summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bx/src/allocator.cpp
diff options
context:
space:
mode:
author Miodrag Milanović <mmicko@gmail.com>2023-01-05 15:32:40 +0100
committer GitHub <noreply@github.com>2023-01-05 09:32:40 -0500
commit812e6094f47bb8d1da5a6b421aa4c724cf2035c0 (patch)
tree0f5bab2fe9393d1f629e9bf63e76cecca74ec0c9 /3rdparty/bx/src/allocator.cpp
parent4a1b41854bba8fc2567906b88bab8ca81e75d187 (diff)
Update BGFX, BX and BIMG (#10789)
* Update to bgfx a93a714632b79b5ddbf5c86ac323fa9b76ed3433 Co-authored-by: Бранимир Караџић <branimirkaradzic@gmail.com>
Diffstat (limited to '3rdparty/bx/src/allocator.cpp')
-rw-r--r--3rdparty/bx/src/allocator.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/3rdparty/bx/src/allocator.cpp b/3rdparty/bx/src/allocator.cpp
index 0bcf2cd43c7..203631f6009 100644
--- a/3rdparty/bx/src/allocator.cpp
+++ b/3rdparty/bx/src/allocator.cpp
@@ -1,9 +1,8 @@
/*
- * Copyright 2010-2021 Branimir Karadzic. All rights reserved.
- * License: https://github.com/bkaradzic/bx#license-bsd-2-clause
+ * Copyright 2010-2022 Branimir Karadzic. All rights reserved.
+ * License: https://github.com/bkaradzic/bx/blob/master/LICENSE
*/
-#include "bx_p.h"
#include <bx/allocator.h>
#include <malloc.h>
@@ -38,7 +37,7 @@ namespace bx
BX_UNUSED(_file, _line);
_aligned_free(_ptr);
# else
- bx::alignedFree(this, _ptr, _align, _file, _line);
+ alignedFree(this, _ptr, _align, _file, _line);
# endif // BX_
}
@@ -55,7 +54,7 @@ namespace bx
BX_UNUSED(_file, _line);
return _aligned_malloc(_size, _align);
# else
- return bx::alignedAlloc(this, _size, _align, _file, _line);
+ return alignedAlloc(this, _size, _align, _file, _line);
# endif // BX_
}
@@ -68,7 +67,7 @@ namespace bx
BX_UNUSED(_file, _line);
return _aligned_realloc(_ptr, _size, _align);
# else
- return bx::alignedRealloc(this, _ptr, _size, _align, _file, _line);
+ return alignedRealloc(this, _ptr, _size, _align, _file, _line);
# endif // BX_
}