From 947913fc54325bea88dd52ea219ea2c69e334c97 Mon Sep 17 00:00:00 2001
From: whythat <yuri.zhykin@gmail.com>
Date: Mon, 18 Jul 2016 12:23:42 +0300
Subject: [PATCH] use std::map::erase(const_iterator, const_iterator) to get
 non-constant iterator

---
 src/limitedmap.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/limitedmap.h b/src/limitedmap.h
index 4d9bb4fa2..7841d7f4a 100644
--- a/src/limitedmap.h
+++ b/src/limitedmap.h
@@ -66,8 +66,11 @@ public:
     }
     void update(const_iterator itIn, const mapped_type& v)
     {
-        // TODO: When we switch to C++11, use map.erase(itIn, itIn) to get the non-const iterator.
-        iterator itTarget = map.find(itIn->first);
+        // Using map::erase() with empty range instead of map::find() to get a non-const iterator,
+        // since it is a constant time operation in C++11. For more details, see
+        // https://stackoverflow.com/questions/765148/how-to-remove-constness-of-const-iterator
+        iterator itTarget = map.erase(itIn, itIn);
+        
         if (itTarget == map.end())
             return;
         std::pair<rmap_iterator, rmap_iterator> itPair = rmap.equal_range(itTarget->second);