diff options
| author | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-02-12 19:42:30 +0900 |
|---|---|---|
| committer | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-02-12 19:42:30 +0900 |
| commit | 4b351ab4252f3e2fba8373262eb54dc8cd33760f (patch) | |
| tree | 32560a346235a29f4f1ad050de4ecbd37be486da | |
| parent | 1443689e8d54961e5288e144ba3a051e9e3bac8a (diff) | |
| download | platform_build_kati-4b351ab4252f3e2fba8373262eb54dc8cd33760f.tar.gz platform_build_kati-4b351ab4252f3e2fba8373262eb54dc8cd33760f.tar.bz2 platform_build_kati-4b351ab4252f3e2fba8373262eb54dc8cd33760f.zip | |
[C++] Remove all warnings from clang
| -rw-r--r-- | expr.cc | 4 | ||||
| -rw-r--r-- | find.cc | 10 | ||||
| -rw-r--r-- | var.h | 28 |
3 files changed, 21 insertions, 21 deletions
@@ -62,7 +62,7 @@ class Literal : public Value { s->append(s_.begin(), s_.end()); } - virtual bool IsLiteral() const { return true; } + virtual bool IsLiteral() const override { return true; } virtual string DebugString_() const override { return s_.as_string(); @@ -109,7 +109,7 @@ class Expr : public Value { return r; } - virtual Value* Compact() { + virtual Value* Compact() override { if (vals_.size() != 1) { return this; } @@ -154,7 +154,7 @@ class DirentFileNode : public DirentNode { virtual bool RunFind(const FindCommand& fc, int d, string* path, unordered_map<const DirentNode*, string>*, - string* out) const { + string* out) const override { PrintIfNecessary(fc, *path, type_, d, out); return true; } @@ -205,7 +205,7 @@ class DirentDirNode : public DirentNode { } } - virtual const DirentNode* FindDir(StringPiece d) const { + virtual const DirentNode* FindDir(StringPiece d) const override { if (d.empty() || d == ".") return this; size_t index = d.find('/'); @@ -224,7 +224,7 @@ class DirentDirNode : public DirentNode { virtual bool RunFind(const FindCommand& fc, int d, string* path, unordered_map<const DirentNode*, string>* cur_read_dirs, - string* out) const { + string* out) const override { ScopedReadDirTracker srdt(this, *path, cur_read_dirs); if (!srdt.ok()) { fprintf(stderr, "FindEmulator: find: File system loop detected; `%s' is " @@ -308,7 +308,7 @@ class DirentSymlinkNode : public DirentNode { : DirentNode(name), to_(NULL), errno_(0) { } - virtual const DirentNode* FindDir(StringPiece d) const { + virtual const DirentNode* FindDir(StringPiece d) const override { if (errno_ == 0 && to_) return to_->FindDir(d); return NULL; @@ -317,7 +317,7 @@ class DirentSymlinkNode : public DirentNode { virtual bool RunFind(const FindCommand& fc, int d, string* path, unordered_map<const DirentNode*, string>* cur_read_dirs, - string* out) const { + string* out) const override { unsigned char type = DT_LNK; if (fc.follows_symlinks && errno_ != ENOENT) { if (errno_) { @@ -65,16 +65,16 @@ class SimpleVar : public Var { explicit SimpleVar(VarOrigin origin); SimpleVar(const string& v, VarOrigin origin); - virtual const char* Flavor() const { + virtual const char* Flavor() const override { return "simple"; } - virtual VarOrigin Origin() const { + virtual VarOrigin Origin() const override { return origin_; } virtual void Eval(Evaluator* ev, string* s) const override; - virtual void AppendVar(Evaluator* ev, Value* v); + virtual void AppendVar(Evaluator* ev, Value* v) override; virtual StringPiece String() const override; @@ -91,16 +91,16 @@ class RecursiveVar : public Var { public: RecursiveVar(Value* v, VarOrigin origin, StringPiece orig); - virtual const char* Flavor() const { + virtual const char* Flavor() const override { return "recursive"; } - virtual VarOrigin Origin() const { + virtual VarOrigin Origin() const override { return origin_; } virtual void Eval(Evaluator* ev, string* s) const override; - virtual void AppendVar(Evaluator* ev, Value* v); + virtual void AppendVar(Evaluator* ev, Value* v) override; virtual StringPiece String() const override; @@ -116,13 +116,13 @@ class UndefinedVar : public Var { public: UndefinedVar(); - virtual const char* Flavor() const { + virtual const char* Flavor() const override { return "undefined"; } - virtual VarOrigin Origin() const { + virtual VarOrigin Origin() const override { return VarOrigin::UNDEFINED; } - virtual bool IsDefined() const { return false; } + virtual bool IsDefined() const override { return false; } virtual void Eval(Evaluator* ev, string* s) const override; @@ -141,19 +141,19 @@ class RuleVar : public Var { delete v_; } - virtual const char* Flavor() const { + virtual const char* Flavor() const override { return v_->Flavor(); } - virtual VarOrigin Origin() const { + virtual VarOrigin Origin() const override { return v_->Origin(); } - virtual bool IsDefined() const { + virtual bool IsDefined() const override { return v_->IsDefined(); } - virtual void Eval(Evaluator* ev, string* s) const { + virtual void Eval(Evaluator* ev, string* s) const override { v_->Eval(ev, s); } - virtual void AppendVar(Evaluator* ev, Value* v) { + virtual void AppendVar(Evaluator* ev, Value* v) override { v_->AppendVar(ev, v); } virtual StringPiece String() const override { |
