summaryrefslogtreecommitdiff
path: root/src/nodedef.cpp
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-04-25 10:17:53 +0200
committerLoïc Blot <loic.blot@unix-experience.fr>2017-04-25 10:21:42 +0200
commita7e131f53e211ffbe38d34d23b33e13cc401f013 (patch)
treec615160a94df851752d62bfc2a4cf9f4d01f63ab /src/nodedef.cpp
parentaf9630962134346750f12c9f1856eae00e0dfe02 (diff)
downloadminetest-a7e131f53e211ffbe38d34d23b33e13cc401f013.tar.gz
minetest-a7e131f53e211ffbe38d34d23b33e13cc401f013.tar.bz2
minetest-a7e131f53e211ffbe38d34d23b33e13cc401f013.zip
Fix various points reported by cppcheck (#5656)
* Fix various performance issues reported by cppcheck + code style (CI) * Make CI happy with code style on master * guiFileSelectMenu: remove useless includes * some performance fixes pointed by cppcheck * remove some useless casts * TextDest: remove unused setFormSpec function * Fix various iterator post-increment reported by cppcheck
Diffstat (limited to 'src/nodedef.cpp')
-rw-r--r--src/nodedef.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index db28325aa..ce2834c91 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -1318,22 +1318,21 @@ void CNodeDefManager::removeNode(const std::string &name)
// Erase node content from all groups it belongs to
for (UNORDERED_MAP<std::string, GroupItems>::iterator iter_groups =
- m_group_to_items.begin();
- iter_groups != m_group_to_items.end();) {
+ m_group_to_items.begin(); iter_groups != m_group_to_items.end();) {
GroupItems &items = iter_groups->second;
for (GroupItems::iterator iter_groupitems = items.begin();
iter_groupitems != items.end();) {
if (iter_groupitems->first == id)
items.erase(iter_groupitems++);
else
- iter_groupitems++;
+ ++iter_groupitems;
}
// Check if group is empty
if (items.size() == 0)
m_group_to_items.erase(iter_groups++);
else
- iter_groups++;
+ ++iter_groups;
}
}