diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-03 21:36:10 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-04 18:40:08 -0800 |
| commit | 277ccbd200ea43590dfc06a93ae184a765327ad0 (patch) | |
| tree | d89712e93da5fb2748989353c9ee071102cf3f33 /runtime/lock_word-inl.h | |
| parent | ad17d41841ba1fb177fb0bf175ec0e9f5e1412b3 (diff) | |
| download | android_art-277ccbd200ea43590dfc06a93ae184a765327ad0.tar.gz android_art-277ccbd200ea43590dfc06a93ae184a765327ad0.tar.bz2 android_art-277ccbd200ea43590dfc06a93ae184a765327ad0.zip | |
ART: More warnings
Enable -Wno-conversion-null, -Wredundant-decls and -Wshadow in general,
and -Wunused-but-set-parameter for GCC builds.
Change-Id: I81bbdd762213444673c65d85edae594a523836e5
Diffstat (limited to 'runtime/lock_word-inl.h')
| -rw-r--r-- | runtime/lock_word-inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/lock_word-inl.h b/runtime/lock_word-inl.h index cf6f83cb62..c52578f8a2 100644 --- a/runtime/lock_word-inl.h +++ b/runtime/lock_word-inl.h @@ -34,13 +34,13 @@ inline uint32_t LockWord::ThinLockCount() const { inline Monitor* LockWord::FatLockMonitor() const { DCHECK_EQ(GetState(), kFatLocked); - MonitorId mon_id = static_cast<MonitorId>(value_ & ~(kStateMask << kStateShift)); + MonitorId mon_id = value_ & ~(kStateMask << kStateShift); return MonitorPool::MonitorFromMonitorId(mon_id); } inline size_t LockWord::ForwardingAddress() const { DCHECK_EQ(GetState(), kForwardingAddress); - return static_cast<size_t>(value_ << kStateSize); + return value_ << kStateSize; } inline LockWord::LockWord() : value_(0) { |