diff options
| author | Alexey Samsonov <samsonov@google.com> | 2012-06-19 07:40:45 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2012-06-19 07:40:45 +0000 |
| commit | 64afb7ef53b4f08477e7af29cfce17eb66754e59 (patch) | |
| tree | 03c53e13b7f852112d4249755cc8f42c183ea3db /lib/sanitizer_common/sanitizer_placement_new.h | |
| parent | 0a9d891dee5a67719ba52797376a647f05ffe67a (diff) | |
[Sanitizer] use fully qualified type for placement new replacement
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@158706 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_placement_new.h')
| -rw-r--r-- | lib/sanitizer_common/sanitizer_placement_new.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sanitizer_common/sanitizer_placement_new.h b/lib/sanitizer_common/sanitizer_placement_new.h index 4dd71aeaf..f133a6ffe 100644 --- a/lib/sanitizer_common/sanitizer_placement_new.h +++ b/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; } |