[clang-tidy] use auto
Found with modernize-use-auto Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
parent
2423b9effb
commit
6f304dee38
@ -5,7 +5,7 @@ Directives::Directives() : version{true, 1, 2}, tags{} {}
|
|||||||
|
|
||||||
const std::string Directives::TranslateTagHandle(
|
const std::string Directives::TranslateTagHandle(
|
||||||
const std::string& handle) const {
|
const std::string& handle) const {
|
||||||
std::map<std::string, std::string>::const_iterator it = tags.find(handle);
|
auto it = tags.find(handle);
|
||||||
if (it == tags.end()) {
|
if (it == tags.end()) {
|
||||||
if (handle == "!!")
|
if (handle == "!!")
|
||||||
return "tag:yaml.org,2002:";
|
return "tag:yaml.org,2002:";
|
||||||
|
|||||||
@ -109,9 +109,9 @@ void node_data::compute_seq_size() const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void node_data::compute_map_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()) {
|
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())
|
if (it->first->is_defined() && it->second->is_defined())
|
||||||
m_undefinedPairs.erase(it);
|
m_undefinedPairs.erase(it);
|
||||||
it = jt;
|
it = jt;
|
||||||
@ -209,7 +209,7 @@ node* node_data::get(node& key, shared_memory_holder /* pMemory */) const {
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (node_map::const_iterator it = m_map.begin(); it != m_map.end(); ++it) {
|
for (auto it = m_map.begin(); it != m_map.end(); ++it) {
|
||||||
if (it->first->is(key))
|
if (it->first->is(key))
|
||||||
return it->second;
|
return it->second;
|
||||||
}
|
}
|
||||||
@ -244,15 +244,14 @@ bool node_data::remove(node& key, shared_memory_holder /* pMemory */) {
|
|||||||
if (m_type != NodeType::Map)
|
if (m_type != NodeType::Map)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
for (kv_pairs::iterator it = m_undefinedPairs.begin();
|
for (auto it = m_undefinedPairs.begin(); it != m_undefinedPairs.end();) {
|
||||||
it != m_undefinedPairs.end();) {
|
auto jt = std::next(it);
|
||||||
kv_pairs::iterator jt = std::next(it);
|
|
||||||
if (it->first->is(key))
|
if (it->first->is(key))
|
||||||
m_undefinedPairs.erase(it);
|
m_undefinedPairs.erase(it);
|
||||||
it = jt;
|
it = jt;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (node_map::iterator it = m_map.begin(); it != m_map.end(); ++it) {
|
for (auto it = m_map.begin(); it != m_map.end(); ++it) {
|
||||||
if (it->first->is(key)) {
|
if (it->first->is(key)) {
|
||||||
m_map.erase(it);
|
m_map.erase(it);
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@ -13,7 +13,7 @@ void NodeEvents::AliasManager::RegisterReference(const detail::node& node) {
|
|||||||
|
|
||||||
anchor_t NodeEvents::AliasManager::LookupAnchor(
|
anchor_t NodeEvents::AliasManager::LookupAnchor(
|
||||||
const detail::node& node) const {
|
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())
|
if (it == m_anchorByIdentity.end())
|
||||||
return 0;
|
return 0;
|
||||||
return it->second;
|
return it->second;
|
||||||
@ -95,7 +95,7 @@ void NodeEvents::Emit(const detail::node& node, EventHandler& handler,
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool NodeEvents::IsAliased(const detail::node& node) const {
|
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;
|
return it != m_refCount.end() && it->second > 1;
|
||||||
}
|
}
|
||||||
} // namespace YAML
|
} // namespace YAML
|
||||||
|
|||||||
@ -422,7 +422,7 @@ anchor_t SingleDocParser::RegisterAnchor(const std::string& name) {
|
|||||||
|
|
||||||
anchor_t SingleDocParser::LookupAnchor(const Mark& mark,
|
anchor_t SingleDocParser::LookupAnchor(const Mark& mark,
|
||||||
const std::string& name) const {
|
const std::string& name) const {
|
||||||
Anchors::const_iterator it = m_anchors.find(name);
|
auto it = m_anchors.find(name);
|
||||||
if (it == m_anchors.end())
|
if (it == m_anchors.end())
|
||||||
throw ParserException(mark, ErrorMsg::UNKNOWN_ANCHOR);
|
throw ParserException(mark, ErrorMsg::UNKNOWN_ANCHOR);
|
||||||
|
|
||||||
|
|||||||
@ -151,7 +151,7 @@ inline UtfIntroCharType IntroCharTypeOf(std::istream::int_type ch) {
|
|||||||
|
|
||||||
inline char Utf8Adjust(unsigned long ch, unsigned char lead_bits,
|
inline char Utf8Adjust(unsigned long ch, unsigned char lead_bits,
|
||||||
unsigned char rshift) {
|
unsigned char rshift) {
|
||||||
const unsigned char header =
|
const auto header =
|
||||||
static_cast<unsigned char>(((1 << lead_bits) - 1) << (8 - lead_bits));
|
static_cast<unsigned char>(((1 << lead_bits) - 1) << (8 - lead_bits));
|
||||||
const unsigned char mask = (0xFF >> (lead_bits + 1));
|
const unsigned char mask = (0xFF >> (lead_bits + 1));
|
||||||
return static_cast<char>(
|
return static_cast<char>(
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user