summaryrefslogtreecommitdiff
path: root/src/staticobject.cpp
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-08-20 13:30:50 +0200
committerGitHub <noreply@github.com>2017-08-20 13:30:50 +0200
commit1c1c97cbd1d7913ac12bf550ec02c97f843a0fd3 (patch)
tree03dd0c39e323c7f0b1f06014ff30e74f429bfa01 /src/staticobject.cpp
parent50669cd2822a11570ae462972194eeb2d585a8c1 (diff)
downloadminetest-1c1c97cbd1d7913ac12bf550ec02c97f843a0fd3.tar.gz
minetest-1c1c97cbd1d7913ac12bf550ec02c97f843a0fd3.tar.bz2
minetest-1c1c97cbd1d7913ac12bf550ec02c97f843a0fd3.zip
Modernize source code: last part (#6285)
* Modernize source code: last par * Use empty when needed * Use emplace_back instead of push_back when needed * For range-based loops * Initializers fixes * constructors, destructors default * c++ C stl includes
Diffstat (limited to 'src/staticobject.cpp')
-rw-r--r--src/staticobject.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/staticobject.cpp b/src/staticobject.cpp
index d656b6221..6ad2e1f94 100644
--- a/src/staticobject.cpp
+++ b/src/staticobject.cpp
@@ -59,17 +59,12 @@ void StaticObjectList::serialize(std::ostream &os)
}
writeU16(os, count);
- for(std::vector<StaticObject>::iterator
- i = m_stored.begin();
- i != m_stored.end(); ++i) {
- StaticObject &s_obj = *i;
+ for (StaticObject &s_obj : m_stored) {
s_obj.serialize(os);
}
- for(std::map<u16, StaticObject>::iterator
- i = m_active.begin();
- i != m_active.end(); ++i)
- {
- StaticObject s_obj = i->second;
+
+ for (auto &i : m_active) {
+ StaticObject s_obj = i.second;
s_obj.serialize(os);
}
}