summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author balr0g <balrog032@gmail.com>2015-06-07 12:25:38 -0400
committer balr0g <balrog032@gmail.com>2015-06-07 12:25:38 -0400
commit021aa9eb6cf57bedcc99e28c505bc8470877607b (patch)
treef8724457e80dc7d1b35b579b83394e5aff6fcbe6
parent72794f8ff1c1e79bd0350bb52fb3757bdf04d004 (diff)
Nope. (nw)
This reverts commit 72794f8ff1c1e79bd0350bb52fb3757bdf04d004. At least this provides a more useful stacktrace, if anyone wants to debug.
-rw-r--r--scripts/genie.lua1
-rw-r--r--src/lib/util/corealloc.h8
-rw-r--r--src/osd/osdcomm.h1
3 files changed, 5 insertions, 5 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 7a591db050b..bdd97f427c5 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -923,6 +923,7 @@ end
end
if (version >= 30400) then
buildoptions {
+ "-Wno-inline-new-delete",
"-Wno-constant-logical-operand",
}
end
diff --git a/src/lib/util/corealloc.h b/src/lib/util/corealloc.h
index a3f05ddd270..5b002557769 100644
--- a/src/lib/util/corealloc.h
+++ b/src/lib/util/corealloc.h
@@ -60,10 +60,10 @@ class zeromem_t { };
#ifndef NO_MEM_TRACKING
// standard new/delete operators (try to avoid using)
-ATTR_FORCE_INLINE ATTR_USED inline void *operator new(std::size_t size) throw (std::bad_alloc) { return malloc_file_line(size, NULL, 0, false, true, false); }
-ATTR_FORCE_INLINE ATTR_USED inline void *operator new[](std::size_t size) throw (std::bad_alloc) { return malloc_file_line(size, NULL, 0, true, true, false); }
-ATTR_FORCE_INLINE ATTR_USED inline void operator delete(void *ptr) throw() { if (ptr != NULL) free_file_line(ptr, NULL, 0, false); }
-ATTR_FORCE_INLINE ATTR_USED inline void operator delete[](void *ptr) throw() { if (ptr != NULL) free_file_line(ptr, NULL, 0, true); }
+ATTR_FORCE_INLINE inline void *operator new(std::size_t size) throw (std::bad_alloc) { return malloc_file_line(size, NULL, 0, false, true, false); }
+ATTR_FORCE_INLINE inline void *operator new[](std::size_t size) throw (std::bad_alloc) { return malloc_file_line(size, NULL, 0, true, true, false); }
+ATTR_FORCE_INLINE inline void operator delete(void *ptr) throw() { if (ptr != NULL) free_file_line(ptr, NULL, 0, false); }
+ATTR_FORCE_INLINE inline void operator delete[](void *ptr) throw() { if (ptr != NULL) free_file_line(ptr, NULL, 0, true); }
#endif
diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h
index e41d9663615..2df16b8db02 100644
--- a/src/osd/osdcomm.h
+++ b/src/osd/osdcomm.h
@@ -31,7 +31,6 @@
/* Some optimizations/warnings cleanups for GCC */
#if defined(__GNUC__) && (__GNUC__ >= 3)
#define ATTR_UNUSED __attribute__((__unused__))
-#define ATTR_USED __attribute__((__used__))
#define ATTR_NORETURN __attribute__((noreturn))
#define ATTR_PRINTF(x,y) __attribute__((format(printf, x, y)))
#define ATTR_MALLOC __attribute__((malloc))