From a7a7908dc5b025c0cc41c2a8f02de4f2b9b2205c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 16 Jun 2020 08:22:14 -0700 Subject: [PATCH] [clang-tidy] use auto (#888) Found with modernize-use-auto Signed-off-by: Rosen Penev --- src/directives.cpp | 2 +- src/node_data.cpp | 9 ++++----- src/nodeevents.cpp | 4 ++-- src/singledocparser.cpp | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/directives.cpp b/src/directives.cpp index 0c85d0f..f6e9587 100644 --- a/src/directives.cpp +++ b/src/directives.cpp @@ -5,7 +5,7 @@ Directives::Directives() : version{true, 1, 2}, tags{} {} const std::string Directives::TranslateTagHandle( const std::string& handle) const { - std::map::const_iterator it = tags.find(handle); + auto it = tags.find(handle); if (it == tags.end()) { if (handle == "!!") return "tag:yaml.org,2002:"; diff --git a/src/node_data.cpp b/src/node_data.cpp index 8eb286c..da2aefc 100644 --- a/src/node_data.cpp +++ b/src/node_data.cpp @@ -110,9 +110,9 @@ void node_data::compute_seq_size() const { } void node_data::compute_map_size() const { - kv_pairs::iterator it = m_undefinedPairs.begin(); + auto it = m_undefinedPairs.begin(); while (it != m_undefinedPairs.end()) { - kv_pairs::iterator jt = std::next(it); + auto jt = std::next(it); if (it->first->is_defined() && it->second->is_defined()) m_undefinedPairs.erase(it); it = jt; @@ -248,9 +248,8 @@ bool node_data::remove(node& key, const shared_memory_holder& /* pMemory */) { if (m_type != NodeType::Map) return false; - for (kv_pairs::iterator it = m_undefinedPairs.begin(); - it != m_undefinedPairs.end();) { - kv_pairs::iterator jt = std::next(it); + for (auto it = m_undefinedPairs.begin(); it != m_undefinedPairs.end();) { + auto jt = std::next(it); if (it->first->is(key)) m_undefinedPairs.erase(it); it = jt; diff --git a/src/nodeevents.cpp b/src/nodeevents.cpp index 51fbe55..b1774fe 100644 --- a/src/nodeevents.cpp +++ b/src/nodeevents.cpp @@ -13,7 +13,7 @@ void NodeEvents::AliasManager::RegisterReference(const detail::node& node) { anchor_t NodeEvents::AliasManager::LookupAnchor( const detail::node& node) const { - AnchorByIdentity::const_iterator it = m_anchorByIdentity.find(node.ref()); + auto it = m_anchorByIdentity.find(node.ref()); if (it == m_anchorByIdentity.end()) return 0; return it->second; @@ -92,7 +92,7 @@ void NodeEvents::Emit(const detail::node& node, EventHandler& handler, } bool NodeEvents::IsAliased(const detail::node& node) const { - RefCount::const_iterator it = m_refCount.find(node.ref()); + auto it = m_refCount.find(node.ref()); return it != m_refCount.end() && it->second > 1; } } // namespace YAML diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp index c8f75e0..5e00515 100644 --- a/src/singledocparser.cpp +++ b/src/singledocparser.cpp @@ -422,7 +422,7 @@ anchor_t SingleDocParser::RegisterAnchor(const std::string& name) { anchor_t SingleDocParser::LookupAnchor(const Mark& mark, const std::string& name) const { - Anchors::const_iterator it = m_anchors.find(name); + auto it = m_anchors.find(name); if (it == m_anchors.end()) throw ParserException(mark, ErrorMsg::UNKNOWN_ANCHOR);