| Index: base/memory/singleton.h
|
| diff --git a/base/memory/singleton.h b/base/memory/singleton.h
|
| index cfdff7831f9f7b5a4ad1be5aa955f33d73112641..6f9598f36c9dd444024015ab2f6e33f1434244a1 100644
|
| --- a/base/memory/singleton.h
|
| +++ b/base/memory/singleton.h
|
| @@ -130,13 +130,13 @@ struct StaticMemorySingletonTraits {
|
| static void Resurrect() { subtle::NoBarrier_Store(&dead_, 0); }
|
|
|
| private:
|
| - static AlignedMemory<sizeof(Type), ALIGNOF(Type)> buffer_;
|
| + static AlignedMemory<sizeof(Type), alignof(Type)> buffer_;
|
| // Signal the object was already deleted, so it is not revived.
|
| static subtle::Atomic32 dead_;
|
| };
|
|
|
| template <typename Type>
|
| -AlignedMemory<sizeof(Type), ALIGNOF(Type)>
|
| +AlignedMemory<sizeof(Type), alignof(Type)>
|
| StaticMemorySingletonTraits<Type>::buffer_;
|
| template <typename Type>
|
| subtle::Atomic32 StaticMemorySingletonTraits<Type>::dead_ = 0;
|
|
|