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

Unified Diff: base/memory/aligned_memory_unittest.cc

Issue 1497963002: [DO NOT COMMIT] Use C++11 alignof/alignas everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Give up on alignas. Created 5 years 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
« no previous file with comments | « base/compiler_specific.h ('k') | third_party/WebKit/Source/wtf/Alignment.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/aligned_memory_unittest.cc
diff --git a/base/memory/aligned_memory_unittest.cc b/base/memory/aligned_memory_unittest.cc
index 5d681f9a3887b17ec53638f38e7b237f30529e38..8bdf11e1370fe379da0fc2601be6e167cfe5f316 100644
--- a/base/memory/aligned_memory_unittest.cc
+++ b/base/memory/aligned_memory_unittest.cc
@@ -19,10 +19,10 @@ TEST(AlignedMemoryTest, StaticAlignment) {
static AlignedMemory<8, 256> raw256;
static AlignedMemory<8, 4096> raw4096;
- EXPECT_EQ(8u, ALIGNOF(raw8));
- EXPECT_EQ(16u, ALIGNOF(raw16));
- EXPECT_EQ(256u, ALIGNOF(raw256));
- EXPECT_EQ(4096u, ALIGNOF(raw4096));
+ EXPECT_EQ(8u, ALIGNOF(decltype(raw8)));
+ EXPECT_EQ(16u, ALIGNOF(decltype(raw16)));
+ EXPECT_EQ(256u, ALIGNOF(decltype(raw256)));
+ EXPECT_EQ(4096u, ALIGNOF(decltype(raw4096)));
EXPECT_ALIGNED(raw8.void_data(), 8);
EXPECT_ALIGNED(raw16.void_data(), 16);
@@ -35,9 +35,9 @@ TEST(AlignedMemoryTest, StackAlignment) {
AlignedMemory<8, 16> raw16;
AlignedMemory<8, 128> raw128;
- EXPECT_EQ(8u, ALIGNOF(raw8));
- EXPECT_EQ(16u, ALIGNOF(raw16));
- EXPECT_EQ(128u, ALIGNOF(raw128));
+ EXPECT_EQ(8u, ALIGNOF(decltype(raw8)));
+ EXPECT_EQ(16u, ALIGNOF(decltype(raw16)));
+ EXPECT_EQ(128u, ALIGNOF(decltype(raw128)));
EXPECT_ALIGNED(raw8.void_data(), 8);
EXPECT_ALIGNED(raw16.void_data(), 16);
@@ -55,13 +55,13 @@ TEST(AlignedMemoryTest, StackAlignment) {
// https://code.google.com/p/nativeclient/issues/detail?id=3463
#if !(defined(OS_NACL) && defined(ARCH_CPU_X86_64))
AlignedMemory<8, 256> raw256;
- EXPECT_EQ(256u, ALIGNOF(raw256));
+ EXPECT_EQ(256u, ALIGNOF(decltype(raw256)));
EXPECT_ALIGNED(raw256.void_data(), 256);
// TODO(ios): This test hits an armv7 bug in clang. crbug.com/138066
#if !(defined(OS_IOS) && defined(ARCH_CPU_ARM_FAMILY))
AlignedMemory<8, 4096> raw4096;
- EXPECT_EQ(4096u, ALIGNOF(raw4096));
+ EXPECT_EQ(4096u, ALIGNOF(decltype(raw4096)));
EXPECT_ALIGNED(raw4096.void_data(), 4096);
#endif // !(defined(OS_IOS) && defined(ARCH_CPU_ARM_FAMILY))
#endif // !(defined(OS_NACL) && defined(ARCH_CPU_X86_64))
« no previous file with comments | « base/compiler_specific.h ('k') | third_party/WebKit/Source/wtf/Alignment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698