From 04b5ac36a50a5fdaf3510c3c4c4e89bc35cfe26e Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Wed, 29 Aug 2012 14:06:02 -0700 Subject: Remove unnecessary compiler pragma. With dlmalloc 2.8.6 the compiler pragmas to suppress warnings are not necessary. Also fix compiler warning about redefinition of LOG_TAG. Depends upon: https://android-review.googlesource.com/42351 Change-Id: I50f70be31f4bd994b09083e722759464476c70b3 --- libpixelflinger/codeflinger/CodeCache.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'libpixelflinger/codeflinger/CodeCache.cpp') diff --git a/libpixelflinger/codeflinger/CodeCache.cpp b/libpixelflinger/codeflinger/CodeCache.cpp index 7688290..f9ae00a 100644 --- a/libpixelflinger/codeflinger/CodeCache.cpp +++ b/libpixelflinger/codeflinger/CodeCache.cpp @@ -22,13 +22,13 @@ #include #include -#include #include #include +#define LOG_TAG "CodeCache" +#include -#include "codeflinger/CodeCache.h" -#define LOG_TAG "CodeCache" +#include "codeflinger/CodeCache.h" namespace android { @@ -63,12 +63,7 @@ static void heap_error(const char* msg, const char* function, void* p); #define USAGE_ERROR_ACTION(m,p) \ heap_error("ARGUMENT IS INVALID HEAP ADDRESS", __FUNCTION__, p) - -#pragma GCC diagnostic ignored "-Wstrict-aliasing" -#pragma GCC diagnostic ignored "-Wempty-body" #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) { ALOG(LOG_FATAL, LOG_TAG, "@@@ ABORTING: CODE FLINGER: %s IN %s addr=%p", -- cgit v1.1