| 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))
|
|
|