summaryrefslogtreecommitdiffstats
path: root/vm/alloc/DlMalloc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'vm/alloc/DlMalloc.cpp')
-rw-r--r--vm/alloc/DlMalloc.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/vm/alloc/DlMalloc.cpp b/vm/alloc/DlMalloc.cpp
index 8638ab5fa..157180100 100644
--- a/vm/alloc/DlMalloc.cpp
+++ b/vm/alloc/DlMalloc.cpp
@@ -36,11 +36,7 @@ static void heap_error(const char* msg, const char* function, void* p);
* dlmalloc for our use for mspaces (regular dlmalloc is still declared
* in bionic).
*/
-#pragma GCC diagnostic ignored "-Wempty-body"
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#include "../../../bionic/libc/upstream-dlmalloc/malloc.c"
-#pragma GCC diagnostic warning "-Wstrict-aliasing"
-#pragma GCC diagnostic warning "-Wempty-body"
static void heap_error(const char* msg, const char* function, void* p) {