Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(925)

Unified Diff: base/lazy_instance_unittest.cc

Issue 2932053002: Use C++11 alignment primitives (Closed)
Patch Set: Put back ALIGNAS Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/lazy_instance_unittest.cc
diff --git a/base/lazy_instance_unittest.cc b/base/lazy_instance_unittest.cc
index 0aa46594657be33c5abba5ccc2c9232311097f5f..0f91598d3985e54668eed0e5482a75e55dbd4fde 100644
--- a/base/lazy_instance_unittest.cc
+++ b/base/lazy_instance_unittest.cc
@@ -3,11 +3,11 @@
// found in the LICENSE file.
#include <stddef.h>
+#include <type_traits>
#include "base/at_exit.h"
#include "base/atomic_sequence_num.h"
#include "base/lazy_instance.h"
-#include "base/memory/aligned_memory.h"
#include "base/threading/simple_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -152,7 +152,7 @@ class AlignedData {
public:
AlignedData() {}
~AlignedData() {}
- base::AlignedMemory<alignment, alignment> data_;
+ typename std::aligned_storage<alignment, alignment>::type data_;
};
} // anonymous namespace

Powered by Google App Engine
This is Rietveld 408576698