X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fmaputils.h;fp=source%2Fcore%2Fmaputils.h;h=f5faa1271a2e1317523767c5e9c3e6a858792027;hp=66b4e3baf82c50d815f5bcf4ce0615729ebbf0fb;hb=f24e7b96e76b63c9b9b8a6bce4c7a9db64276ea8;hpb=9f754b788b872f9768af8c3a4f9e001a588e011a

diff --git a/source/core/maputils.h b/source/core/maputils.h
index 66b4e3b..f5faa12 100644
--- a/source/core/maputils.h
+++ b/source/core/maputils.h
@@ -57,7 +57,7 @@ private:
 template<typename T>
 typename T::mapped_type &get_item(T &map, const typename T::key_type &key)
 {
-	typename T::iterator i = map.find(key);
+	auto i = map.find(key);
 	if(i==map.end())
 		throw key_error(key);
 
@@ -67,7 +67,7 @@ typename T::mapped_type &get_item(T &map, const typename T::key_type &key)
 template<typename T>
 const typename T::mapped_type &get_item(const T &map, const typename T::key_type &key)
 {
-	typename T::const_iterator i = map.find(key);
+	auto i = map.find(key);
 	if(i==map.end())
 		throw key_error(key);
 
@@ -86,7 +86,7 @@ typename T::iterator insert_unique(T &map, const typename T::key_type &key, cons
 	if(map.count(key))
 		throw key_error(key);
 
-	return map.insert(typename T::value_type(key, item)).first;
+	return map.insert(std::make_pair(key, item)).first;
 }
 
 template<typename T>