diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-13 19:38:25 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-13 19:38:25 +0000 |
| commit | f0d930ae5aa3ce03c124585a0feb303e1da52541 (patch) | |
| tree | a4052994a274d2eaa10cffeecfc7616d1961e17c /base | |
| parent | 82e116f2fc854c891b0125c675f5eb3c131e7836 (diff) | |
| download | chromium_src-f0d930ae5aa3ce03c124585a0feb303e1da52541.zip chromium_src-f0d930ae5aa3ce03c124585a0feb303e1da52541.tar.gz chromium_src-f0d930ae5aa3ce03c124585a0feb303e1da52541.tar.bz2 | |
Fix a couple "extra qualification" compile errors in method declarations, and move related non-Win32-specific files to common build target.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/SConscript | 8 | ||||
| -rw-r--r-- | base/histogram.h | 4 | ||||
| -rw-r--r-- | base/tracked_objects.h | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/base/SConscript b/base/SConscript index 0dc9d25..4b787631 100644 --- a/base/SConscript +++ b/base/SConscript @@ -60,6 +60,7 @@ input_files = [ 'command_line.cc', 'debug_util.cc', 'file_util.cc', + 'histogram.cc', 'icu_util.cc', 'json_reader.cc', 'json_writer.cc', @@ -75,6 +76,9 @@ input_files = [ 'string_piece.cc', 'string_util.cc', 'string_util_icu.cc', + 'timer.cc', + 'tracked.cc', + 'tracked_objects.cc', 'values.cc', 'word_iterator.cc', ] @@ -90,7 +94,6 @@ if env['PLATFORM'] == 'win32': 'debug_on_start.cc', 'event_recorder.cc', 'file_version_info.cc', - 'histogram.cc', 'hmac.cc', # Uses Windows-specific crypto APIs. 'idle_timer.cc', 'image_util.cc', @@ -108,9 +111,6 @@ if env['PLATFORM'] == 'win32': 'third_party/nss/sha512.cc', 'thread.cc', 'time.cc', - 'timer.cc', - 'tracked.cc', - 'tracked_objects.cc', 'watchdog.cc', 'worker_pool.cc', ]) diff --git a/base/histogram.h b/base/histogram.h index 8b5743f..5714bd7 100644 --- a/base/histogram.h +++ b/base/histogram.h @@ -366,8 +366,7 @@ class LinearHistogram : public Histogram { virtual void InitializeBucketRange(); // Find bucket to increment for sample value. virtual size_t BucketIndex(Sample value) const; - virtual double LinearHistogram::GetBucketSize(Count current, - size_t i) const; + virtual double GetBucketSize(Count current, size_t i) const; // If we have a description for a bucket, then return that. Otherwise // let parent class provide a (numeric) description. @@ -466,4 +465,3 @@ class StatisticsRecorder { }; #endif // BASE_HISTOGRAM_H__ - diff --git a/base/tracked_objects.h b/base/tracked_objects.h index a9ed57a..1ae0b1e 100644 --- a/base/tracked_objects.h +++ b/base/tracked_objects.h @@ -157,7 +157,7 @@ class Snapshot { int64 square_duration() const { return death_data_.square_duration(); } int AverageMsDuration() const { return death_data_.AverageMsDuration(); } - void Snapshot::Write(std::string* output) const; + void Write(std::string* output) const; void Add(const Snapshot& other); |