summaryrefslogtreecommitdiff
path: root/lib/sanitizer_common/sanitizer_placement_new.h
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2013-10-24 06:23:39 +0000
committerPeter Collingbourne <peter@pcc.me.uk>2013-10-24 06:23:39 +0000
commit53177247698bfba075f2d5b255a447fc3ced6976 (patch)
tree570b148c39fdbe22b2e984e270778b73637d6e7f /lib/sanitizer_common/sanitizer_placement_new.h
parenta412f485298901a6cbf9d5d7489e834efebc9483 (diff)
Introduce an operator new for LowLevelAllocator, and convert most users to it.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@193308 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_placement_new.h')
-rw-r--r--lib/sanitizer_common/sanitizer_placement_new.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/sanitizer_common/sanitizer_placement_new.h b/lib/sanitizer_common/sanitizer_placement_new.h
index a42301aed..8904d1040 100644
--- a/lib/sanitizer_common/sanitizer_placement_new.h
+++ b/lib/sanitizer_common/sanitizer_placement_new.h
@@ -18,15 +18,7 @@
#include "sanitizer_internal_defs.h"
-namespace __sanitizer {
-#if (SANITIZER_WORDSIZE == 64) || SANITIZER_MAC
-typedef uptr operator_new_ptr_type;
-#else
-typedef u32 operator_new_ptr_type;
-#endif
-} // namespace __sanitizer
-
-inline void *operator new(__sanitizer::operator_new_ptr_type sz, void *p) {
+inline void *operator new(__sanitizer::operator_new_size_type sz, void *p) {
return p;
}