commit 398f64b5805246765b699839b439e18c0dfbf2ee
author Elliott Hughes <enh@google.com> Mon Mar 26 18:05:48 2012 -0700
committer Elliott Hughes <enh@google.com> Mon Mar 26 18:05:48 2012 -0700
tree de3f86de82289b1734b12cdc7c4292f4aff16f55
parent ee0fa76b2e5d39ad36d1ff144b2d0270df81e606

Remove more lint, mostly C-style casts.

Change-Id: Iaf1f23290e35ed48e5795fb20690953a9a834457

src/monitor.cc

diff --git a/src/monitor.cc b/src/monitor.cc
index cfc7d49..6887010 100644
--- a/src/monitor.cc
+++ b/src/monitor.cc
@@ -86,7 +86,7 @@
  * lock.  Performs no error checking.
  */
 #define LW_MONITOR(x) \
-  ((Monitor*)((x) & ~((LW_HASH_STATE_MASK << LW_HASH_STATE_SHIFT) | LW_SHAPE_MASK)))
+  (reinterpret_cast<Monitor*>((x) & ~((LW_HASH_STATE_MASK << LW_HASH_STATE_SHIFT) | LW_SHAPE_MASK)))
 
 /*
  * Lock recursion count field.  Contains a count of the number of times
@@ -583,9 +583,9 @@
 void Monitor::MonitorEnter(Thread* self, Object* obj) {
   volatile int32_t* thinp = obj->GetRawLockWordAddress();
   struct timespec tm;
-  long sleepDelayNs;
-  long minSleepDelayNs = 1000000;  /* 1 millisecond */
-  long maxSleepDelayNs = 1000000000;  /* 1 second */
+  uint32_t sleepDelayNs;
+  uint32_t minSleepDelayNs = 1000000;  /* 1 millisecond */
+  uint32_t maxSleepDelayNs = 1000000000;  /* 1 second */
   uint32_t thin, newThin;
 
   DCHECK(self != NULL);
@@ -662,8 +662,7 @@
         } else {
           // The thin lock was inflated by another thread. Let the runtime know we are no longer
           // waiting and try again.
-          VLOG(monitor) << "monitor: thread " << threadId
-                        << " found lock " << (void*) thinp << " surprise-fattened by another thread";
+          VLOG(monitor) << StringPrintf("monitor: thread %d found lock %p surprise-fattened by another thread", threadId, thinp);
           self->monitor_enter_object_ = NULL;
           self->SetState(oldStatus);
           goto retry;
@@ -680,7 +679,8 @@
   } else {
     // The lock is a fat lock.
     VLOG(monitor) << StringPrintf("monitor: thread %d locking fat lock %p (%p) %p on a %s",
-          threadId, thinp, LW_MONITOR(*thinp), (void*)*thinp, PrettyTypeOf(obj).c_str());
+                                  threadId, thinp, LW_MONITOR(*thinp),
+                                  reinterpret_cast<void*>(*thinp), PrettyTypeOf(obj).c_str());
     DCHECK(LW_MONITOR(*thinp) != NULL);
     LW_MONITOR(*thinp)->Lock(self);
   }