Use C++11 alignment primitives

base/containers/stack_container_unittest.cc

Index: base/containers/stack_container_unittest.cc
diff --git a/base/containers/stack_container_unittest.cc b/base/containers/stack_container_unittest.cc
index 05c733a4a79b4e0f63d9852955877c59dcfbd377..c79e9651d6cce86896951e072a8b88c566fb4bdd 100644
--- a/base/containers/stack_container_unittest.cc
+++ b/base/containers/stack_container_unittest.cc
@@ -7,8 +7,8 @@
 #include <stddef.h>
 
 #include <algorithm>
+#include <type_traits>
 
-#include "base/memory/aligned_memory.h"
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -107,9 +107,9 @@ namespace {
 template <size_t alignment>
 class AlignedData {
  public:
-  AlignedData() { memset(data_.void_data(), 0, alignment); }
+  AlignedData() { memset(&data_, 0, alignment); }
   ~AlignedData() {}
-  base::AlignedMemory<alignment, alignment> data_;
+  typename std::aligned_storage<alignment, alignment>::type data_;

[danakj, 2017/06/12 18:32:10]

C++14 adds this (http://en.cppreference.com/w/cpp/types/aligned_storage):

template< std::size_t Len, std::size_t Align = /*default-alignment*/ >
using aligned_storage_t = typename aligned_storage<Len, Align>::type;

So we don't have to do this typename ::type dance. WDYT of adding a
base::aligned_storage_t to template_util in the meantime?

[brettw, 2017/06/12 22:22:15]

I just replaced these all with char arrays. This seems clearer to me anyway, and
the code is shorter.

[danakj, 2017/06/12 22:23:10]

Me too, that is A+

 };
 
 }  // anonymous namespace
@@ -120,11 +120,11 @@ class AlignedData {
 TEST(StackContainer, BufferAlignment) {
   StackVector<wchar_t, 16> text;
   text->push_back(L'A');
-  EXPECT_ALIGNED(&text[0], ALIGNOF(wchar_t));
+  EXPECT_ALIGNED(&text[0], alignof(wchar_t));
 
   StackVector<double, 1> doubles;
   doubles->push_back(0.0);
-  EXPECT_ALIGNED(&doubles[0], ALIGNOF(double));
+  EXPECT_ALIGNED(&doubles[0], alignof(double));
 
   StackVector<AlignedData<16>, 1> aligned16;
   aligned16->push_back(AlignedData<16>());