From 519be81acc6684e9be9d25bb5590cbe294e49022 Mon Sep 17 00:00:00 2001
From: DarthArgus <darg.us@yandex.com>
Date: Thu, 3 Mar 2016 11:19:23 -0600
Subject: [PATCH] Revert f1c197e700e726d768006f0e91b4ecceaa5bb7eb and fix our
 crash issue...this is silly

---
 external/ours/library/archive/src/shared/AutoDeltaSet.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/external/ours/library/archive/src/shared/AutoDeltaSet.h b/external/ours/library/archive/src/shared/AutoDeltaSet.h
index 9f64da22..e413c21e 100644
--- a/external/ours/library/archive/src/shared/AutoDeltaSet.h
+++ b/external/ours/library/archive/src/shared/AutoDeltaSet.h
@@ -184,6 +184,12 @@ inline typename AutoDeltaSet<ValueType, ObjectType>::const_iterator AutoDeltaSet
 		m_commands.push_back(c);
 		++m_baselineCommandCount;
 		
+		// hack to convert from const_iterator to iterator as required by std libs
+		typename SetType::iterator tmp(m_set.begin());
+        	std::advance(tmp, std::distance<const_iterator>(tmp, i));
+        	i++;
+        	m_set.erase(tmp);
+
 		touch();
 		onErase(c.value);
 		onChanged();