diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-10-24 12:19:11 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-10-24 12:19:11 +0100 |
| commit | 6aea44fc2b842e14de18006ed7609f4a90cd3bf4 (patch) | |
| tree | 7aab53b4e2e0c8376c752c2844c5805a8448bb85 /disas/libvixl/utils.h | |
| parent | c6faa758e30c3563f22ffbee11bf206a3ee952c8 (diff) | |
disas/libvixl: Update to libvixl 1.6
Update our copy of libvixl to upstream 1.6. There are no
changes of any particular interest to QEMU, so this is simply
keeping up with current upstream.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1412091418-25744-1-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'disas/libvixl/utils.h')
| -rw-r--r-- | disas/libvixl/utils.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/disas/libvixl/utils.h b/disas/libvixl/utils.h index b472f0e6c..1540c3060 100644 --- a/disas/libvixl/utils.h +++ b/disas/libvixl/utils.h @@ -171,7 +171,7 @@ bool IsPowerOf2(int64_t value); template<typename T> bool IsWordAligned(T pointer) { VIXL_ASSERT(sizeof(pointer) == sizeof(intptr_t)); // NOLINT(runtime/sizeof) - return (reinterpret_cast<intptr_t>(pointer) & 3) == 0; + return ((intptr_t)(pointer) & 3) == 0; } // Increment a pointer until it has the specified alignment. @@ -204,7 +204,6 @@ T AlignDown(T pointer, size_t alignment) { return (T)(pointer_raw - align_step); } - } // namespace vixl #endif // VIXL_UTILS_H |