summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2012-06-19 07:40:45 +0000
committerAlexey Samsonov <samsonov@google.com>2012-06-19 07:40:45 +0000
commitb13ac747d4fe4fb6d1fe79ab854f0b1e51e780a8 (patch)
treee5033b61ec2c1c627ae88868af98ee9f95d4732d
parentd9ae7adb841ab300bc0bebe6015ddedab59d90f2 (diff)
downloadbcm5719-llvm-b13ac747d4fe4fb6d1fe79ab854f0b1e51e780a8.tar.gz
bcm5719-llvm-b13ac747d4fe4fb6d1fe79ab854f0b1e51e780a8.zip
[Sanitizer] use fully qualified type for placement new replacement
llvm-svn: 158706
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h b/compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h
index 4dd71aeaf4b..f133a6ffe51 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h
@@ -20,13 +20,13 @@
namespace __sanitizer {
#if (__WORDSIZE == 64) || defined(__APPLE__)
-typedef __sanitizer::uptr operator_new_ptr_type;
+typedef uptr operator_new_ptr_type;
#else
-typedef __sanitizer::u32 operator_new_ptr_type;
+typedef u32 operator_new_ptr_type;
#endif
} // namespace __sanitizer
-inline void *operator new(operator_new_ptr_type sz, void *p) {
+inline void *operator new(__sanitizer::operator_new_ptr_type sz, void *p) {
return p;
}
OpenPOWER on IntegriCloud