diff options
author | 2023-01-05 05:12:10 +0100 | |
---|---|---|
committer | 2023-01-04 23:12:10 -0500 | |
commit | 5581eaa50a42256242f32569f59ce10d70ddd8c2 (patch) | |
tree | 0d79e41b381ebf6d50ab5b7e20c0993b7328b5b6 /3rdparty/bx/src/allocator.cpp | |
parent | 34c37d4f5415f886ec3ae462b008cebbf5fa22f9 (diff) |
Update BGFX, BX and BIMG (#10750)
* 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.cpp | 11 |
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_ } |