diff options
| author | 2018-12-12 02:27:48 +0000 | |
|---|---|---|
| committer | 2018-12-12 02:27:48 +0000 | |
| commit | 2260cf563b2f8ce29bf508e205f8d5459aac25db (patch) | |
| tree | c60fa0d1aa5b113591292d2d3e679e96ea243b09 | |
| parent | 3437d3929f9064fe2d1707f9a1f99f69accf4a17 (diff) | |
| parent | 3b015746bb77f4e4763a2023ab42e517ffa3f641 (diff) | |
Merge "Ignore expansion-to-defined warning from dlmalloc include"
| -rw-r--r-- | runtime/gc/allocator/dlmalloc.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/gc/allocator/dlmalloc.cc b/runtime/gc/allocator/dlmalloc.cc index e508d5fddf..11ad8a84bf 100644 --- a/runtime/gc/allocator/dlmalloc.cc +++ b/runtime/gc/allocator/dlmalloc.cc @@ -38,6 +38,7 @@ static void art_heap_usage_error(const char* function, void* p); #pragma GCC diagnostic ignored "-Wempty-body" #pragma GCC diagnostic ignored "-Wstrict-aliasing" #pragma GCC diagnostic ignored "-Wnull-pointer-arithmetic" +#pragma GCC diagnostic ignored "-Wexpansion-to-defined" #include "../../../external/dlmalloc/malloc.c" // Note: malloc.c uses a DEBUG define to drive debug code. This interferes with the DEBUG severity // of libbase, so undefine it now. |