| Index: base/containers/stack_container.h
|
| diff --git a/base/containers/stack_container.h b/base/containers/stack_container.h
|
| index 9e0efc13b41f428aeedf94efb8ec0c6a3cfb13b1..9a05e466b6f0305460393ebcf457832ae846f415 100644
|
| --- a/base/containers/stack_container.h
|
| +++ b/base/containers/stack_container.h
|
| @@ -57,9 +57,9 @@ class StackAllocator : public std::allocator<T> {
|
| // The buffer itself. It is not of type T because we don't want the
|
| // constructors and destructors to be automatically called. Define a POD
|
| // buffer of the right size instead.
|
| - base::AlignedMemory<sizeof(T[stack_capacity]), ALIGNOF(T)> stack_buffer_;
|
| + base::AlignedMemory<sizeof(T[stack_capacity]), alignof(T)> stack_buffer_;
|
| #if defined(__GNUC__) && !defined(ARCH_CPU_X86_FAMILY)
|
| - static_assert(ALIGNOF(T) <= 16, "http://crbug.com/115612");
|
| + static_assert(alignof(T) <= 16, "http://crbug.com/115612");
|
| #endif
|
|
|
| // Set when the stack buffer is used for an allocation. We do not track
|
|
|