From c55bb390d88b8eb62a50932f7f9b47c2a3733f16 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 21 Sep 2018 00:02:02 +0000 Subject: Revert^2 "ART: Refactor typedef to using" This reverts commit ee07743e03042c2ca36e0c9513847a9e7d2509f1. Reason for revert: fixed attributes. Bug: 32619234 Test: m test-art-host Test: m test-art-target-gtest-unstarted_runtime_test Change-Id: I6f0a775adfdf6ecd132b470f7c5446e949872e20 --- runtime/interpreter/unstarted_runtime_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'runtime/interpreter/unstarted_runtime_test.cc') diff --git a/runtime/interpreter/unstarted_runtime_test.cc b/runtime/interpreter/unstarted_runtime_test.cc index 200fc5b334..bd2705d530 100644 --- a/runtime/interpreter/unstarted_runtime_test.cc +++ b/runtime/interpreter/unstarted_runtime_test.cc @@ -261,7 +261,7 @@ TEST_F(UnstartedRuntimeTest, MemoryPeekShort) { UnstartedMemoryPeekShort(self, tmp.get(), &result, 0); - typedef int16_t unaligned_short __attribute__ ((aligned (1))); + using unaligned_short __attribute__((__aligned__(1))) = int16_t; const unaligned_short* short_ptr = reinterpret_cast(base_ptr + i); EXPECT_EQ(result.GetS(), *short_ptr); } @@ -284,7 +284,7 @@ TEST_F(UnstartedRuntimeTest, MemoryPeekInt) { UnstartedMemoryPeekInt(self, tmp.get(), &result, 0); - typedef int32_t unaligned_int __attribute__ ((aligned (1))); + using unaligned_int __attribute__((__aligned__(1))) = int32_t; const unaligned_int* int_ptr = reinterpret_cast(base_ptr + i); EXPECT_EQ(result.GetI(), *int_ptr); } @@ -307,7 +307,7 @@ TEST_F(UnstartedRuntimeTest, MemoryPeekLong) { UnstartedMemoryPeekLong(self, tmp.get(), &result, 0); - typedef int64_t unaligned_long __attribute__ ((aligned (1))); + using unaligned_long __attribute__((__aligned__(1))) = int64_t; const unaligned_long* long_ptr = reinterpret_cast(base_ptr + i); EXPECT_EQ(result.GetJ(), *long_ptr); } -- cgit v1.2.3-59-g8ed1b