| Index: base/memory/singleton.h
|
| diff --git a/base/memory/singleton.h b/base/memory/singleton.h
|
| index 4564790722b121fefcd19e4d0b6a587b108c46c0..5b5562b84dbe0185cf05a54f5c17b18779c6fdcc 100644
|
| --- a/base/memory/singleton.h
|
| +++ b/base/memory/singleton.h
|
| @@ -127,12 +127,12 @@ struct StaticMemorySingletonTraits {
|
| }
|
|
|
| private:
|
| - static base::AlignedMemory<sizeof(Type), ALIGNOF(Type)> buffer_;
|
| + static base::AlignedMemory<ALIGNOF(Type), sizeof(Type)> buffer_;
|
| // Signal the object was already deleted, so it is not revived.
|
| static base::subtle::Atomic32 dead_;
|
| };
|
|
|
| -template <typename Type> base::AlignedMemory<sizeof(Type), ALIGNOF(Type)>
|
| +template <typename Type> base::AlignedMemory<ALIGNOF(Type), sizeof(Type)>
|
| StaticMemorySingletonTraits<Type>::buffer_;
|
| template <typename Type> base::subtle::Atomic32
|
| StaticMemorySingletonTraits<Type>::dead_ = 0;
|
|
|