From 818aac3c73fc96bd87e6e965d39eac9b62cb2e39 Mon Sep 17 00:00:00 2001
From: jeffro256 <jeffro256@tutanota.com>
Date: Mon, 28 Apr 2025 10:28:21 -0500
Subject: [PATCH] upstream: tighten definition of reverse_erase

---
 src/common/container_helpers.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/common/container_helpers.h b/src/common/container_helpers.h
index 2048de8d0..421d195de 100644
--- a/src/common/container_helpers.h
+++ b/src/common/container_helpers.h
@@ -169,13 +169,10 @@ void for_all_in_map_erase_if(std::unordered_map<KeyT, ValueT> &map_inout, PredT
 
 /// erase with a reverse iterator
 /// returned iterator is (pos + 1) if pos hadn't been erased
-template <typename ContainerT, typename ReverseIteratorT>
-ReverseIteratorT reverse_erase(ContainerT &container, ReverseIteratorT pos)
+template <typename ContainerT, typename FwdIterT>
+std::reverse_iterator<FwdIterT> reverse_erase(ContainerT &container, std::reverse_iterator<FwdIterT> pos)
 {
-    static_assert(std::is_same_v<ReverseIteratorT, typename ContainerT::reverse_iterator>
-        || std::is_same_v<ReverseIteratorT, typename ContainerT::const_reverse_iterator>);
-
-    return ReverseIteratorT(container.erase((++pos).base()));
+    return std::reverse_iterator<FwdIterT>(container.erase((++pos).base()));
 }
 
 } //namespace tools