| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "allocator_shim/allocator_stub.h" | 5 #include "allocator_shim/allocator_stub.h" |
| 6 | 6 |
| 7 #if defined(OS_MACOSX) | 7 #if defined(OS_MACOSX) || defined(OS_ANDROID) |
| 8 #error "The allocator stub isn't supported (or needed) on mac." | 8 #error "The allocator stub isn't supported (or needed) on mac or android." |
| 9 #endif | 9 #endif |
| 10 | 10 |
| 11 void* Allocate(std::size_t n) { | 11 void* Allocate(std::size_t n) { |
| 12 return operator new(n); | 12 return operator new(n); |
| 13 } | 13 } |
| 14 | 14 |
| 15 void Dellocate(void* p) { | 15 void Dellocate(void* p) { |
| 16 return operator delete(p); | 16 return operator delete(p); |
| 17 } | 17 } |
| OLD | NEW |