Use C++11 alignment primitives

third_party/WebKit/Source/platform/wtf/StdLibExtras.h

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WTF_StdLibExtras_h
 #define WTF_StdLibExtras_h
 
 #include <cstddef>
-#include "base/memory/aligned_memory.h"
 #include "base/numerics/safe_conversions.h"
 #include "platform/wtf/Assertions.h"
 #include "platform/wtf/CPU.h"
 #include "platform/wtf/LeakAnnotations.h"
 #include "platform/wtf/Noncopyable.h"
 #include "platform/wtf/TypeTraits.h"
 
 #if DCHECK_IS_ON()
 #include "platform/wtf/Threading.h"
 #endif
@@ skipping 115 matching lines @@
 
    private:
     T* pointer_;
   };
 
   template <typename T>
   class InstanceStorage<T, true> {
    public:
     template <typename HeapNew, typename PlacementNew>
     InstanceStorage(const HeapNew&, const PlacementNew& placement_new) {
-      placement_new(object_.void_data());
+      placement_new(&object_);
     }
-    T* Get() { return object_.template data_as<T>(); }
+    T* Get() { return reinterpret_cast<T*>(object_); }
 
    private:
-    base::AlignedMemory<sizeof(T), ALIGNOF(T)> object_;
+    alignas(T) char object_[sizeof(T)];
   };
 
   InstanceStorage<WrapperType> instance_;
 #if DCHECK_IS_ON()
   bool safely_initialized_;
   ThreadIdentifier thread_;
 #endif
 };
 
 }  // namespace WTF
@@ skipping 110 matching lines @@
 char (&ArrayLengthHelperFunction(T (&)[0]))[0];
 #endif
 #define WTF_ARRAY_LENGTH(array) sizeof(::WTF::ArrayLengthHelperFunction(array))
 
 }  // namespace WTF
 
 using WTF::BitwiseCast;
 using WTF::SafeCast;
 
 #endif  // WTF_StdLibExtras_h