diff options
author | 2023-09-08 05:14:35 +1000 | |
---|---|---|
committer | 2023-09-08 05:14:35 +1000 | |
commit | 44eb5ea3c69dcec37e2b687e479297af5303efc3 (patch) | |
tree | 2784753bdf56564ce3b4cf0f410bf07709854fdd /3rdparty/bx/src/allocator.cpp | |
parent | 1147d8fc44c701ed0235e9374f97d218fae37b32 (diff) |
Revert "Updated bgfx, bx and bimg to current upstream versions. (#11493)"
This reverts commit 1c61ccfe840cdae7a9f92292946a45f3b47e2412.
Diffstat (limited to '3rdparty/bx/src/allocator.cpp')
-rw-r--r-- | 3rdparty/bx/src/allocator.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/3rdparty/bx/src/allocator.cpp b/3rdparty/bx/src/allocator.cpp index 5e536db0d5a..203631f6009 100644 --- a/3rdparty/bx/src/allocator.cpp +++ b/3rdparty/bx/src/allocator.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Branimir Karadzic. All rights reserved. + * Copyright 2010-2022 Branimir Karadzic. All rights reserved. * License: https://github.com/bkaradzic/bx/blob/master/LICENSE */ @@ -21,7 +21,7 @@ namespace bx { } - void* DefaultAllocator::realloc(void* _ptr, size_t _size, size_t _align, const char* _filePath, uint32_t _line) + void* DefaultAllocator::realloc(void* _ptr, size_t _size, size_t _align, const char* _file, uint32_t _line) { if (0 == _size) { @@ -34,10 +34,10 @@ namespace bx } # if BX_COMPILER_MSVC - BX_UNUSED(_filePath, _line); + BX_UNUSED(_file, _line); _aligned_free(_ptr); # else - alignedFree(this, _ptr, _align, Location(_filePath, _line) ); + alignedFree(this, _ptr, _align, _file, _line); # endif // BX_ } @@ -51,10 +51,10 @@ namespace bx } # if BX_COMPILER_MSVC - BX_UNUSED(_filePath, _line); + BX_UNUSED(_file, _line); return _aligned_malloc(_size, _align); # else - return alignedAlloc(this, _size, _align, Location(_filePath, _line) ); + return alignedAlloc(this, _size, _align, _file, _line); # endif // BX_ } @@ -64,10 +64,10 @@ namespace bx } # if BX_COMPILER_MSVC - BX_UNUSED(_filePath, _line); + BX_UNUSED(_file, _line); return _aligned_realloc(_ptr, _size, _align); # else - return alignedRealloc(this, _ptr, _size, _align, Location(_filePath, _line) ); + return alignedRealloc(this, _ptr, _size, _align, _file, _line); # endif // BX_ } |