Merge "Don't use std::allocator::pointer" into main am: 55af483b78
am: 1e1940d434
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2901505 Change-Id: I82bbc9bad9f7bd4ba20226ab9113f2b398dccf86 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
fb3c316d41
1 changed files with 1 additions and 1 deletions
|
@ -28,7 +28,7 @@ namespace vold {
|
||||||
// Allocator that delegates useful work to standard one but zeroes data before deallocating.
|
// Allocator that delegates useful work to standard one but zeroes data before deallocating.
|
||||||
class ZeroingAllocator : public std::allocator<char> {
|
class ZeroingAllocator : public std::allocator<char> {
|
||||||
public:
|
public:
|
||||||
void deallocate(pointer p, size_type n) {
|
void deallocate(value_type* p, size_type n) {
|
||||||
memset_explicit(p, 0, n);
|
memset_explicit(p, 0, n);
|
||||||
std::allocator<char>::deallocate(p, n);
|
std::allocator<char>::deallocate(p, n);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue