diff options
author | Mathieu Chartier <mathieuc@google.com> | 2014-07-16 19:55:08 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-16 16:25:15 +0000 |
commit | 479f131d4bd3829dd512312020808b05f5a591f1 (patch) | |
tree | a826b9fe32a5d107263c4bdda6f6255a7c7cd301 /runtime/utils.h | |
parent | e66f6318635c49313f796e62170fa8f59340e926 (diff) | |
parent | 4c13a3ff475f206c4d0a86ee2595c45392fd942f (diff) | |
download | art-479f131d4bd3829dd512312020808b05f5a591f1.tar.gz art-479f131d4bd3829dd512312020808b05f5a591f1.tar.bz2 art-479f131d4bd3829dd512312020808b05f5a591f1.zip |
Merge "Disable adding main and non moving spaces to immune region in GSS"
Diffstat (limited to 'runtime/utils.h')
-rw-r--r-- | runtime/utils.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/runtime/utils.h b/runtime/utils.h index 2cb3af7aec..c920050234 100644 --- a/runtime/utils.h +++ b/runtime/utils.h @@ -167,8 +167,7 @@ struct TypeIdentity { // For rounding integers. template<typename T> -static constexpr T RoundDown(T x, typename TypeIdentity<T>::type n) - __attribute__((warn_unused_result)); +static constexpr T RoundDown(T x, typename TypeIdentity<T>::type n) WARN_UNUSED; template<typename T> static constexpr T RoundDown(T x, typename TypeIdentity<T>::type n) { @@ -178,8 +177,7 @@ static constexpr T RoundDown(T x, typename TypeIdentity<T>::type n) { } template<typename T> -static constexpr T RoundUp(T x, typename TypeIdentity<T>::type n) - __attribute__((warn_unused_result)); +static constexpr T RoundUp(T x, typename TypeIdentity<T>::type n) WARN_UNUSED; template<typename T> static constexpr T RoundUp(T x, typename TypeIdentity<T>::type n) { @@ -188,7 +186,7 @@ static constexpr T RoundUp(T x, typename TypeIdentity<T>::type n) { // For aligning pointers. template<typename T> -static inline T* AlignDown(T* x, uintptr_t n) __attribute__((warn_unused_result)); +static inline T* AlignDown(T* x, uintptr_t n) WARN_UNUSED; template<typename T> static inline T* AlignDown(T* x, uintptr_t n) { @@ -196,7 +194,7 @@ static inline T* AlignDown(T* x, uintptr_t n) { } template<typename T> -static inline T* AlignUp(T* x, uintptr_t n) __attribute__((warn_unused_result)); +static inline T* AlignUp(T* x, uintptr_t n) WARN_UNUSED; template<typename T> static inline T* AlignUp(T* x, uintptr_t n) { |