Use C++11 features with containers

[libs/core.git] / source / debug / profiler.cpp

diff --git a/source/debug/profiler.cpp b/source/debug/profiler.cpp
index c4c880b70241c826d87e7db7ba3598bc8034be84..c82558b01f6e119720e7d119d5c2cf6d2ef36a65 100644 (file)
--- a/source/debug/profiler.cpp
+++ b/source/debug/profiler.cpp
@@ -18,9 +18,9 @@ void Profiler::set_period(unsigned p)
                return;
 
        period = p;
-       for(map<string, ScopeInfo>::iterator i=scopes.begin(); i!=scopes.end(); ++i)
+       for(auto &kvp: scopes)
        {
-               ScopeInfo &si = i->second;
+               ScopeInfo &si = kvp.second;
                if(p==0)
                        si.history.clear();
                else
@@ -34,7 +34,7 @@ void Profiler::add_scope(const string &name)
 {
        if(!scopes.count(name))
        {
-               map<string, ScopeInfo>::iterator i = scopes.insert(map<string, ScopeInfo>::value_type(name, ScopeInfo())).first;
+               auto i = scopes.insert(make_pair(name, ScopeInfo())).first;
                i->second.history.resize(period);
        }
 }
@@ -48,10 +48,10 @@ ProfilingScope *Profiler::enter(ProfilingScope *ps)
 
 void Profiler::record(const ProfilingScope &scope)
 {
-       map<string, ScopeInfo>::iterator i = scopes.find(scope.get_name());
+       auto i = scopes.find(scope.get_name());
        if(i==scopes.end())
        {
-               i = scopes.insert(map<string, ScopeInfo>::value_type(scope.get_name(), ScopeInfo())).first;
+               i = scopes.insert(make_pair(scope.get_name(), ScopeInfo())).first;
                i->second.first_call = scope.get_entry_time();
                i->second.history.resize(period);
        }