| Index: base/metrics/persistent_memory_allocator.h
|
| diff --git a/base/metrics/persistent_memory_allocator.h b/base/metrics/persistent_memory_allocator.h
|
| index 7fd96a4405be28616bd64f4aba49b96390e87e94..5a2e0906ef1c83bcadd45e171b460b6dec135429 100644
|
| --- a/base/metrics/persistent_memory_allocator.h
|
| +++ b/base/metrics/persistent_memory_allocator.h
|
| @@ -471,7 +471,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>
|
| @@ -499,7 +499,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));
|
| // Change the type, clearing the memory if so desired. The new type is
|
| // "transitioning" so that there is no race condition with the construction
|
| // of the object should another thread be simultaneously iterating over
|
|
|