summaryrefslogtreecommitdiffstats
path: root/include/jemalloc/jemalloc_protos.h.in
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2015-09-15 22:55:37 (GMT)
committerJason Evans <jasone@canonware.com>2015-09-15 22:55:37 (GMT)
commit9898051fd16ebd5d29dc27aae5e069fe04486ff3 (patch)
treeadeab60b769c0dffa0782bd46eb60e741b4a2ff9 /include/jemalloc/jemalloc_protos.h.in
parent6e98caf8f064482b9ab292ef3638dea67420bbc2 (diff)
parent1d7540c9d71ee8a85ea97c9459698e090ee04719 (diff)
downloadjemalloc-4.0.1.zip
jemalloc-4.0.1.tar.gz
jemalloc-4.0.1.tar.bz2
Merge branch 'dev'4.0.1
Diffstat (limited to 'include/jemalloc/jemalloc_protos.h.in')
-rw-r--r--include/jemalloc/jemalloc_protos.h.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/jemalloc/jemalloc_protos.h.in b/include/jemalloc/jemalloc_protos.h.in
index 317ffdb..a78414b 100644
--- a/include/jemalloc/jemalloc_protos.h.in
+++ b/include/jemalloc/jemalloc_protos.h.in
@@ -56,7 +56,7 @@ JEMALLOC_EXPORT size_t JEMALLOC_NOTHROW @je_@malloc_usable_size(
#ifdef JEMALLOC_OVERRIDE_MEMALIGN
JEMALLOC_EXPORT JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN
void JEMALLOC_NOTHROW *@je_@memalign(size_t alignment, size_t size)
- JEMALLOC_ATTR(malloc);
+ JEMALLOC_CXX_THROW JEMALLOC_ATTR(malloc);
#endif
#ifdef JEMALLOC_OVERRIDE_VALLOC