diff options
| author | Ian Rogers <irogers@google.com> | 2012-09-07 19:28:53 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-07 19:28:54 -0700 |
| commit | 82959f5e46870cb57675d1ebba97294c56508949 (patch) | |
| tree | e45ada8e620f33452f28bbfe00390d8c2de79218 | |
| parent | af03b05009863f5d9761864dcec13e4ee6221d69 (diff) | |
| parent | 04b5ac36a50a5fdaf3510c3c4c4e89bc35cfe26e (diff) | |
| download | system_core-82959f5e46870cb57675d1ebba97294c56508949.zip system_core-82959f5e46870cb57675d1ebba97294c56508949.tar.gz system_core-82959f5e46870cb57675d1ebba97294c56508949.tar.bz2 | |
Merge "Remove unnecessary compiler pragma."
| -rw-r--r-- | libpixelflinger/codeflinger/CodeCache.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
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 <unistd.h> #include <sys/mman.h> -#include <cutils/log.h> #include <cutils/ashmem.h> #include <cutils/atomic.h> +#define LOG_TAG "CodeCache" +#include <cutils/log.h> -#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", |