summaryrefslogtreecommitdiff
path: root/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2016-01-25 17:23:38 -0800
committerChristopher Ferris <cferris@google.com>2016-01-25 17:27:40 -0800
commit1e185a5056f85e281f699a92114b758591ae3b92 (patch)
tree86a88c43ee354e576535d5121d2250dc6412ccb8 /libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
parentf2b67b85f5e192812212d3176c07e195c0ffa503 (diff)
Fix gcc test issues.
Change-Id: I2b26b779f5198c7c9362a452b971260a8852aa7b
Diffstat (limited to 'libc/malloc_debug/tests/malloc_debug_unit_tests.cpp')
-rw-r--r--libc/malloc_debug/tests/malloc_debug_unit_tests.cpp22
1 files changed, 14 insertions, 8 deletions
diff --git a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
index 0e8ca68ee..08731c236 100644
--- a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
+++ b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
@@ -111,14 +111,20 @@ class MallocDebugTest : public ::testing::Test {
};
MallocDispatch MallocDebugTest::dispatch = {
- .calloc = calloc,
- .free = free,
- .mallinfo = mallinfo,
- .malloc = malloc,
- .malloc_usable_size = malloc_usable_size,
- .memalign = memalign,
- .posix_memalign = posix_memalign,
- .realloc = realloc,
+ calloc,
+ free,
+ mallinfo,
+ malloc,
+ malloc_usable_size,
+ memalign,
+ posix_memalign,
+#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
+ nullptr,
+#endif
+ realloc,
+#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
+ nullptr,
+#endif
};
void VerifyAllocCalls() {