| Index: base/metrics/persistent_memory_allocator.h
|
| diff --git a/base/metrics/persistent_memory_allocator.h b/base/metrics/persistent_memory_allocator.h
|
| index 9fdef0192a66195bbadcac295f4ede384f9edfcb..45a24649483f9be72ad86f08712bbf6badf97bd2 100644
|
| --- a/base/metrics/persistent_memory_allocator.h
|
| +++ b/base/metrics/persistent_memory_allocator.h
|
| @@ -427,7 +427,7 @@ class BASE_EXPORT PersistentMemoryAllocator {
|
| return nullptr;
|
| // Ensure the allocator's internal alignment is sufficient for this object.
|
| // This protects against coding errors in the allocator.
|
| - DCHECK_EQ(0U, reinterpret_cast<uintptr_t>(mem) & (ALIGNOF(T) - 1));
|
| + DCHECK_EQ(0U, reinterpret_cast<uintptr_t>(mem) & (alignof(T) - 1));
|
| // First change the type to "transitioning" so that there is no race
|
| // condition with the clearing and construction of the object should
|
| // another thread be simultaneously iterating over data. This will
|
| @@ -469,7 +469,7 @@ class BASE_EXPORT PersistentMemoryAllocator {
|
| const_cast<void*>(GetBlockData(ref, T::kPersistentTypeId, size));
|
| if (!mem)
|
| return nullptr;
|
| - DCHECK_EQ(0U, reinterpret_cast<uintptr_t>(mem) & (ALIGNOF(T) - 1));
|
| + DCHECK_EQ(0U, reinterpret_cast<uintptr_t>(mem) & (alignof(T) - 1));
|
| return new (mem) T();
|
| }
|
| template <typename T>
|
|
|