diff options
| author | 2016-08-12 13:45:57 +0000 | |
|---|---|---|
| committer | 2016-08-12 13:45:57 +0000 | |
| commit | c17d21d44298c4ac31b42b64b4e97020ccdd42a1 (patch) | |
| tree | a120330c0730d64774747dc99bea5ef8f7c9ff1e /runtime/base/macros.h | |
| parent | dce74be0c49e8a540affc0b5649a9cf8756b809b (diff) | |
| parent | 7cbd27fe778f2c348136540d52b5473e28f5769d (diff) | |
Merge "Adjust spacing before NOLINT comments in ART."
Diffstat (limited to 'runtime/base/macros.h')
| -rw-r--r-- | runtime/base/macros.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/base/macros.h b/runtime/base/macros.h index 3c43253e67..5a50247f5a 100644 --- a/runtime/base/macros.h +++ b/runtime/base/macros.h @@ -75,7 +75,7 @@ template<typename T> ART_FRIEND_TEST(test_set_name, individual_test) ALWAYS_INLINE void* operator new(size_t, void* ptr) noexcept { return ptr; } \ ALWAYS_INLINE void operator delete(void*, void*) noexcept { } \ private: \ - void* operator new(size_t) = delete // NOLINT + void* operator new(size_t) = delete // NOLINT // The arraysize(arr) macro returns the # of elements in an array arr. // The expression is a compile-time constant, and therefore can be @@ -135,13 +135,13 @@ char (&ArraySizeHelper(T (&array)[N]))[N]; #define ARRAYSIZE_UNSAFE(a) \ ((sizeof(a) / sizeof(*(a))) / static_cast<size_t>(!(sizeof(a) % sizeof(*(a))))) -#define SIZEOF_MEMBER(t, f) sizeof((reinterpret_cast<t*>(4096))->f) // NOLINT +#define SIZEOF_MEMBER(t, f) sizeof((reinterpret_cast<t*>(4096))->f) // NOLINT #define OFFSETOF_MEMBER(t, f) \ - (reinterpret_cast<uintptr_t>(&reinterpret_cast<t*>(16)->f) - static_cast<uintptr_t>(16u)) // NOLINT + (reinterpret_cast<uintptr_t>(&reinterpret_cast<t*>(16)->f) - static_cast<uintptr_t>(16u)) // NOLINT #define OFFSETOF_MEMBERPTR(t, f) \ - (reinterpret_cast<uintptr_t>(&(reinterpret_cast<t*>(16)->*f)) - static_cast<uintptr_t>(16)) // NOLINT + (reinterpret_cast<uintptr_t>(&(reinterpret_cast<t*>(16)->*f)) - static_cast<uintptr_t>(16)) // NOLINT #define PACKED(x) __attribute__ ((__aligned__(x), __packed__)) |