diff options
| author | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-02-17 17:50:06 +0900 |
|---|---|---|
| committer | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-02-17 17:50:06 +0900 |
| commit | 3deff5bf54db9c5d36b775beffadbae33381d1b1 (patch) | |
| tree | f19b63beb953d7af1d019f646ab463a1c28ffa6f | |
| parent | ad21a4541aeb75a6ef6221cd1a97d41e0bc95ce7 (diff) | |
| download | platform_build_kati-3deff5bf54db9c5d36b775beffadbae33381d1b1.tar.gz platform_build_kati-3deff5bf54db9c5d36b775beffadbae33381d1b1.tar.bz2 platform_build_kati-3deff5bf54db9c5d36b775beffadbae33381d1b1.zip | |
[C++] Use emplace instead of insert+make_pair
| -rw-r--r-- | dep.cc | 2 | ||||
| -rw-r--r-- | file_cache.cc | 2 | ||||
| -rw-r--r-- | var.cc | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -349,7 +349,7 @@ class DepBuilder { rule->outputs.clear(); rule->outputs.push_back(output); - auto p = rules_.insert(make_pair(output, rule)); + auto p = rules_.emplace(output, rule); if (p.second) { if (!first_rule_ && output.get(0) != '.') { rule->is_default_target = true; diff --git a/file_cache.cc b/file_cache.cc index 6a05550..afdb3bd 100644 --- a/file_cache.cc +++ b/file_cache.cc @@ -44,7 +44,7 @@ class MakefileCacheManagerImpl : public MakefileCacheManager { virtual Makefile* ReadMakefile(const string& filename) override { Makefile* result = NULL; - auto p = cache_.insert(make_pair(filename, result)); + auto p = cache_.emplace(filename, result); if (p.second) { p.first->second = result = new Makefile(filename); } else { @@ -125,7 +125,7 @@ Var* Vars::Lookup(Symbol name) const { } void Vars::Assign(Symbol name, Var* v) { - auto p = insert(make_pair(name, v)); + auto p = emplace(name, v); if (!p.second) { Var* orig = p.first->second; if (orig->Origin() == VarOrigin::OVERRIDE || @@ -145,7 +145,7 @@ unordered_set<Symbol> Vars::used_env_vars_; ScopedVar::ScopedVar(Vars* vars, Symbol name, Var* var) : vars_(vars), orig_(NULL) { - auto p = vars->insert(make_pair(name, var)); + auto p = vars->emplace(name, var); iter_ = p.first; if (!p.second) { orig_ = iter_->second; |
