Merge art-cache dex files into oat files
Change-Id: I5a327a4e0b678bd9dabb12de4e21ef05e3fefd0b
diff --git a/src/utils.h b/src/utils.h
index 22afd5d..606f35d 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -35,14 +35,14 @@
template<int n, typename T>
static inline bool IsAligned(T* x) {
- return IsAligned<n>(reinterpret_cast<uintptr_t>(x));
+ return IsAligned<n>(reinterpret_cast<const uintptr_t>(x));
}
#define CHECK_ALIGNED(value, alignment) \
- CHECK(::art::IsAligned<alignment>(value)) << reinterpret_cast<void*>(value)
+ CHECK(::art::IsAligned<alignment>(value)) << reinterpret_cast<const void*>(value)
#define DCHECK_ALIGNED(value, alignment) \
- DCHECK(::art::IsAligned<alignment>(value)) << reinterpret_cast<void*>(value)
+ DCHECK(::art::IsAligned<alignment>(value)) << reinterpret_cast<const void*>(value)
// Check whether an N-bit two's-complement representation can hold value.
static inline bool IsInt(int N, word value) {