Bug 997700 - Fix build issues with LUL and --enable-warnings-as-errors. r=nfroyd.

This commit is contained in:
Julian Seward 2014-04-19 01:30:46 +02:00
parent fdbe3d446d
commit 7f42fc30b7
2 changed files with 0 additions and 11 deletions

View File

@ -197,13 +197,10 @@ class scoped_ptr {
explicit scoped_ptr(T* p = 0): ptr(p) {}
~scoped_ptr() {
typedef char type_must_be_complete[sizeof(T)];
delete ptr;
}
void reset(T* p = 0) {
typedef char type_must_be_complete[sizeof(T)];
if (ptr != p) {
delete ptr;
ptr = p;
@ -286,13 +283,10 @@ class scoped_array {
explicit scoped_array(T* p = 0) : ptr(p) {}
~scoped_array() {
typedef char type_must_be_complete[sizeof(T)];
delete[] ptr;
}
void reset(T* p = 0) {
typedef char type_must_be_complete[sizeof(T)];
if (ptr != p) {
delete [] ptr;
ptr = p;
@ -380,13 +374,10 @@ class scoped_ptr_malloc {
explicit scoped_ptr_malloc(T* p = 0): ptr(p) {}
~scoped_ptr_malloc() {
typedef char type_must_be_complete[sizeof(T)];
free_((void*) ptr);
}
void reset(T* p = 0) {
typedef char type_must_be_complete[sizeof(T)];
if (ptr != p) {
free_((void*) ptr);
ptr = p;

View File

@ -419,7 +419,6 @@ bool LoadSymbols(const string& obj_file,
SecMap* smap,
void* rx_avma,
void (*log)(const char*)) {
typedef typename ElfClass::Addr Addr;
typedef typename ElfClass::Phdr Phdr;
typedef typename ElfClass::Shdr Shdr;
@ -594,7 +593,6 @@ bool ReadSymbolDataElfClass(const typename ElfClass::Ehdr* elf_header,
SecMap* smap, void* rx_avma,
void (*log)(const char*)) {
typedef typename ElfClass::Ehdr Ehdr;
typedef typename ElfClass::Shdr Shdr;
unsigned char identifier[16];
if (!lul