diff options
| author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-28 19:42:25 +0000 |
|---|---|---|
| committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-28 19:42:25 +0000 |
| commit | 3a94937f79257b8af48a7f4d845a85396e43c6b4 (patch) | |
| tree | 440e1c152365033ae0ac510fc02b3d4658980f1f /base | |
| parent | 625f12fa9952840a95eb6f7d24518db3fecf76a7 (diff) | |
| download | chromium_src-3a94937f79257b8af48a7f4d845a85396e43c6b4.zip chromium_src-3a94937f79257b8af48a7f4d845a85396e43c6b4.tar.gz chromium_src-3a94937f79257b8af48a7f4d845a85396e43c6b4.tar.bz2 | |
Fix compilation bug on ARM
Avoid re-use of method name with different signature
when creating custom histograms
TBR=mbelshe
Review URL: http://codereview.chromium.org/6592043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/metrics/histogram.cc | 4 | ||||
| -rw-r--r-- | base/metrics/histogram.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc index c8a766c..2d16582 100644 --- a/base/metrics/histogram.cc +++ b/base/metrics/histogram.cc @@ -928,7 +928,7 @@ scoped_refptr<Histogram> CustomHistogram::FactoryGet( if (!StatisticsRecorder::FindHistogram(name, &histogram)) { CustomHistogram* custom_histogram = new CustomHistogram(name, ranges); - custom_histogram->InitializeBucketRange(ranges); + custom_histogram->InitializedCustomBucketRange(ranges); histogram = custom_histogram; StatisticsRecorder::Register(&histogram); } @@ -952,7 +952,7 @@ CustomHistogram::CustomHistogram(const std::string& name, DCHECK_EQ(custom_ranges[0], 0); } -void CustomHistogram::InitializeBucketRange( +void CustomHistogram::InitializedCustomBucketRange( const std::vector<Sample>& custom_ranges) { DCHECK_GT(custom_ranges.size(), 1u); DCHECK_EQ(custom_ranges[0], 0); diff --git a/base/metrics/histogram.h b/base/metrics/histogram.h index 3a6f009..7217617 100644 --- a/base/metrics/histogram.h +++ b/base/metrics/histogram.h @@ -632,7 +632,7 @@ class CustomHistogram : public Histogram { const std::vector<Sample>& custom_ranges); // Initialize ranges_ mapping. - virtual void InitializeBucketRange(const std::vector<Sample>& custom_ranges); + void InitializedCustomBucketRange(const std::vector<Sample>& custom_ranges); virtual double GetBucketSize(Count current, size_t i) const; DISALLOW_COPY_AND_ASSIGN(CustomHistogram); |