Use C++11 alignment primitives

base/memory/singleton.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // PLEASE READ: Do you really need a singleton?
 //
 // Singletons make it hard to determine the lifetime of an object, which can
 // lead to buggy code and spurious crashes.
 //
 // Instead of adding another singleton into the mix, try to identify either:
 //   a) An existing singleton that can manage your object's lifetime
 //   b) Locations where you can deterministically create the object and pass
 //      into other objects
 //
 // If you absolutely need a singleton, please keep them as trivial as possible
 // and ideally a leaf dependency. Singletons get problematic when they attempt
 // to do too much in their destructor or have circular dependencies.
 
 #ifndef BASE_MEMORY_SINGLETON_H_
 #define BASE_MEMORY_SINGLETON_H_
 
+#include <type_traits>
+
 #include "base/at_exit.h"
 #include "base/atomicops.h"
 #include "base/base_export.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/aligned_memory.h"
 #include "base/threading/thread_restrictions.h"
 
 namespace base {
 namespace internal {
 
 // Our AtomicWord doubles as a spinlock, where a value of
 // kBeingCreatedMarker means the spinlock is being held for creation.
 static const subtle::AtomicWord kBeingCreatedMarker = 1;
 
 // We pull out some of the functionality into a non-templated function, so that
@@ skipping 70 matching lines @@
 // process once you've unloaded.
 template <typename Type>
 struct StaticMemorySingletonTraits {
   // WARNING: User has to deal with get() in the singleton class
   // this is traits for returning NULL.
   static Type* New() {
     // Only constructs once and returns pointer; otherwise returns NULL.
     if (subtle::NoBarrier_AtomicExchange(&dead_, 1))
       return NULL;
 
-    return new(buffer_.void_data()) Type();
+    return new (&buffer_) Type();
   }
 
   static void Delete(Type* p) {
     if (p != NULL)
       p->Type::~Type();
   }
 
   static const bool kRegisterAtExit = true;
   static const bool kAllowedToAccessOnNonjoinableThread = true;
 
   // Exposed for unittesting.
   static void Resurrect() { subtle::NoBarrier_Store(&dead_, 0); }
 
  private:
-  static AlignedMemory<sizeof(Type), ALIGNOF(Type)> buffer_;
+  static
+      typename std::aligned_storage<sizeof(Type), alignof(Type)>::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)>
+typename std::aligned_storage<sizeof(Type), alignof(Type)>::type
     StaticMemorySingletonTraits<Type>::buffer_;
 template <typename Type>
 subtle::Atomic32 StaticMemorySingletonTraits<Type>::dead_ = 0;
 
 // The Singleton<Type, Traits, DifferentiatingType> class manages a single
 // instance of Type which will be created on first use and will be destroyed at
 // normal process exit). The Trait::Delete function will not be called on
 // abnormal process exit.
 //
 // DifferentiatingType is used as a key to differentiate two different
@@ skipping 136 matching lines @@
   }
   static subtle::AtomicWord instance_;
 };
 
 template <typename Type, typename Traits, typename DifferentiatingType>
 subtle::AtomicWord Singleton<Type, Traits, DifferentiatingType>::instance_ = 0;
 
 }  // namespace base
 
 #endif  // BASE_MEMORY_SINGLETON_H_