summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Farina <tfarina@chromium.org>2012-10-09 02:48:11 (GMT)
committerThiago Farina <tfarina@chromium.org>2012-10-17 09:37:48 (GMT)
commita35bd3677f3848939e821505158a7dde8f2a7407 (patch)
tree966245c37fe676bd9ceed34bba92214bc3bccd94
parent8bd8d170e9816bb602d3efbb1d90844762b5ad12 (diff)
downloadNinja-a35bd3677f3848939e821505158a7dde8f2a7407.zip
Ninja-a35bd3677f3848939e821505158a7dde8f2a7407.tar.gz
Ninja-a35bd3677f3848939e821505158a7dde8f2a7407.tar.bz2
Add missing 'virtual' annotation to ReadFile() override.
Signed-off-by: Thiago Farina <tfarina@chromium.org>
-rw-r--r--src/metrics.h7
-rw-r--r--src/ninja.cc2
2 files changed, 3 insertions, 6 deletions
diff --git a/src/metrics.h b/src/metrics.h
index a4ef9f7..044011d 100644
--- a/src/metrics.h
+++ b/src/metrics.h
@@ -62,12 +62,10 @@ private:
/// Epoch varies between platforms; only useful for measuring elapsed time.
int64_t GetTimeMillis();
-
/// A simple stopwatch which returns the time
/// in seconds since Restart() was called.
-class Stopwatch
-{
-public:
+class Stopwatch {
+ public:
Stopwatch() : started_(0) {}
/// Seconds since Restart() call.
@@ -80,7 +78,6 @@ private:
uint64_t Now() const;
};
-
/// The primary interface to metrics. Use METRIC_RECORD("foobar") at the top
/// of a function to get timing stats recorded for each call of the function.
#define METRIC_RECORD(name) \
diff --git a/src/ninja.cc b/src/ninja.cc
index 76b2764..e408ce1 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -140,7 +140,7 @@ int GuessParallelism() {
/// An implementation of ManifestParser::FileReader that actually reads
/// the file.
struct RealFileReader : public ManifestParser::FileReader {
- bool ReadFile(const string& path, string* content, string* err) {
+ virtual bool ReadFile(const string& path, string* content, string* err) {
return ::ReadFile(path, content, err) == 0;
}
};