commit fb6996fe2b1bb28526751650441d7ac29dcdb4e6
author Brian Carlstrom <bdc@google.com> Thu Jul 18 18:21:14 2013 -0700
committer Brian Carlstrom <bdc@google.com> Thu Jul 18 21:55:45 2013 -0700
tree aba94b367c89719413d4be8fa7fd445ce3bee743
parent 3e79aadc447dcdb9e52368baced9405667e68e6a

Fixing cpplint runtime/arrays, runtime/int, runtime/virtual issues

Change-Id: Ia2ff94d2fb69465df26aaf83df82614a483b26e0

runtime/base/mutex.cc

diff --git a/runtime/base/mutex.cc b/runtime/base/mutex.cc
index af45f3f..cb66240 100644
--- a/runtime/base/mutex.cc
+++ b/runtime/base/mutex.cc
@@ -32,7 +32,7 @@
 
 // This works on Mac OS 10.6 but hasn't been tested on older releases.
 struct __attribute__((__may_alias__)) darwin_pthread_mutex_t {
-  long padding0;
+  long padding0;  // NOLINT(runtime/int)
   int padding1;
   uint32_t padding2;
   int16_t padding3;
@@ -43,7 +43,7 @@
 };
 
 struct __attribute__((__may_alias__)) darwin_pthread_rwlock_t {
-  long padding0;
+  long padding0;  // NOLINT(runtime/int)
   pthread_mutex_t padding1;
   int padding2;
   pthread_cond_t padding3;
@@ -72,7 +72,7 @@
 
 #if ART_USE_FUTEXES
 static bool ComputeRelativeTimeSpec(timespec* result_ts, const timespec& lhs, const timespec& rhs) {
-  const long int one_sec = 1000 * 1000 * 1000;  // one second in nanoseconds.
+  const int32_t one_sec = 1000 * 1000 * 1000;  // one second in nanoseconds.
   result_ts->tv_sec = lhs.tv_sec - rhs.tv_sec;
   result_ts->tv_nsec = lhs.tv_nsec - rhs.tv_nsec;
   if (result_ts->tv_nsec < 0) {