diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-19 11:24:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-19 11:24:50 -0700 |
| commit | 9e7723b143b1d9e5581d84a814f52691d29745c8 (patch) | |
| tree | 3f5982ad4274eef3f1ac9b8a315863dae80deeba /runtime/base | |
| parent | c06d623988436a0dcfab7643cc971a88f00f31ed (diff) | |
| parent | fb6996fe2b1bb28526751650441d7ac29dcdb4e6 (diff) | |
| download | art-9e7723b143b1d9e5581d84a814f52691d29745c8.zip art-9e7723b143b1d9e5581d84a814f52691d29745c8.tar.gz art-9e7723b143b1d9e5581d84a814f52691d29745c8.tar.bz2 | |
am fb6996fe: Fixing cpplint runtime/arrays, runtime/int, runtime/virtual issues
* commit 'fb6996fe2b1bb28526751650441d7ac29dcdb4e6':
Fixing cpplint runtime/arrays, runtime/int, runtime/virtual issues
Diffstat (limited to 'runtime/base')
| -rw-r--r-- | runtime/base/mutex.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ namespace art { // 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_mutex_t { }; 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 @@ struct __attribute__((__may_alias__)) glibc_pthread_rwlock_t { #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) { |