Add JEMALLOC_CXX_THROW to the memalign() function prototype.
Add JEMALLOC_CXX_THROW to the memalign() function prototype, in order to
match glibc and avoid compilation errors when including both
jemalloc/jemalloc.h and malloc.h in C++ code.
This change was unintentionally omitted from
ae93d6bf36
(Avoid function prototype
incompatibilities.).
This commit is contained in:
parent
45e9f66c28
commit
5d2e875ac9
@ -13,6 +13,9 @@ brevity. Much more detail can be found in the git revision history:
|
|||||||
- Don't bitshift by negative amounts when encoding/decoding run sizes in chunk
|
- Don't bitshift by negative amounts when encoding/decoding run sizes in chunk
|
||||||
header maps. This affected systems with page sizes greater than 8 KiB.
|
header maps. This affected systems with page sizes greater than 8 KiB.
|
||||||
- Rename index_t to szind_t to avoid an existing type on Solaris.
|
- Rename index_t to szind_t to avoid an existing type on Solaris.
|
||||||
|
- Add JEMALLOC_CXX_THROW to the memalign() function prototype, in order to
|
||||||
|
match glibc and avoid compilation errors when including both
|
||||||
|
jemalloc/jemalloc.h and malloc.h in C++ code.
|
||||||
|
|
||||||
* 4.0.0 (August 17, 2015)
|
* 4.0.0 (August 17, 2015)
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ JEMALLOC_EXPORT size_t JEMALLOC_NOTHROW @je_@malloc_usable_size(
|
|||||||
#ifdef JEMALLOC_OVERRIDE_MEMALIGN
|
#ifdef JEMALLOC_OVERRIDE_MEMALIGN
|
||||||
JEMALLOC_EXPORT JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN
|
JEMALLOC_EXPORT JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN
|
||||||
void JEMALLOC_NOTHROW *@je_@memalign(size_t alignment, size_t size)
|
void JEMALLOC_NOTHROW *@je_@memalign(size_t alignment, size_t size)
|
||||||
JEMALLOC_ATTR(malloc);
|
JEMALLOC_CXX_THROW JEMALLOC_ATTR(malloc);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef JEMALLOC_OVERRIDE_VALLOC
|
#ifdef JEMALLOC_OVERRIDE_VALLOC
|
||||||
|
Loading…
Reference in New Issue
Block a user