diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-19 11:24:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-19 11:24:47 -0700 |
| commit | 58d8b956e7d83bb1b219405be87e135c89b9cdb2 (patch) | |
| tree | 2829f4ab7842a1c17c858bec7a10515a3922a048 /runtime/base | |
| parent | 5775391897aa290d96ad903ddbe00f66e7a6a4f8 (diff) | |
| parent | 02c8cc6d1312a2b55533f02f6369dc7c94672f90 (diff) | |
| download | art-58d8b956e7d83bb1b219405be87e135c89b9cdb2.zip art-58d8b956e7d83bb1b219405be87e135c89b9cdb2.tar.gz art-58d8b956e7d83bb1b219405be87e135c89b9cdb2.tar.bz2 | |
am 02c8cc6d: Fixing cpplint whitespace/blank_line, whitespace/end_of_line, whitespace/labels, whitespace/semicolon issues
* commit '02c8cc6d1312a2b55533f02f6369dc7c94672f90':
Fixing cpplint whitespace/blank_line, whitespace/end_of_line, whitespace/labels, whitespace/semicolon issues
Diffstat (limited to 'runtime/base')
| -rw-r--r-- | runtime/base/histogram_test.cc | 2 | ||||
| -rw-r--r-- | runtime/base/mutex.cc | 4 | ||||
| -rw-r--r-- | runtime/base/timing_logger.cc | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/runtime/base/histogram_test.cc b/runtime/base/histogram_test.cc index 9f3587a..5592f1c 100644 --- a/runtime/base/histogram_test.cc +++ b/runtime/base/histogram_test.cc @@ -129,7 +129,6 @@ TEST(Histtest, UpdateRange) { EXPECT_GE(PerValue, 132); EXPECT_LE(PerValue, 145); } -; TEST(Histtest, Reset) { UniquePtr<Histogram<uint64_t> > hist(new Histogram<uint64_t>("Reset")); @@ -173,7 +172,6 @@ TEST(Histtest, Reset) { EXPECT_GE(PerValue, 132); EXPECT_LE(PerValue, 145); } -; TEST(Histtest, MultipleCreateHist) { UniquePtr<Histogram<uint64_t> > hist(new Histogram<uint64_t>("MultipleCreateHist")); diff --git a/runtime/base/mutex.cc b/runtime/base/mutex.cc index 1df0207..af45f3f 100644 --- a/runtime/base/mutex.cc +++ b/runtime/base/mutex.cc @@ -460,8 +460,8 @@ std::ostream& operator<<(std::ostream& os, const Mutex& mu) { return os; } -ReaderWriterMutex::ReaderWriterMutex(const char* name, LockLevel level) : - BaseMutex(name, level) +ReaderWriterMutex::ReaderWriterMutex(const char* name, LockLevel level) + : BaseMutex(name, level) #if ART_USE_FUTEXES , state_(0), exclusive_owner_(0), num_pending_readers_(0), num_pending_writers_(0) #endif diff --git a/runtime/base/timing_logger.cc b/runtime/base/timing_logger.cc index c7cbbe5..bf6fd17 100644 --- a/runtime/base/timing_logger.cc +++ b/runtime/base/timing_logger.cc @@ -46,7 +46,6 @@ void TimingLogger::AddSplit(const std::string &label) { uint64_t TimingLogger::GetTotalNs() const { return times_.back() - times_.front(); } -; void TimingLogger::Dump(std::ostream &os) const { uint64_t largest_time = 0; |