www/ungoogled-chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.cc


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32

--- chrome/browser/download/bubble/download_bubble_update_service.cc.orig	2023-12-23 12:33:28 UTC
+++ chrome/browser/download/bubble/download_bubble_update_service.cc
@@ -89,7 +89,11 @@ ItemSortKey GetSortKey(const Item& item) {
 // Helper to get an iterator to the last element in the cache. The cache
 // must not be empty.
 template <typename Item>
+#if defined(__clang__) && (__clang_major__ >= 16)
 SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
+#else
+typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
+#endif
   CHECK(!cache.empty());
   auto it = cache.end();
   return std::prev(it);
@@ -1089,9 +1093,17 @@ bool DownloadBubbleUpdateService::CacheManager::Remove
 }
 
 template <typename Id, typename Item>
+#if defined(__clang__) && (__clang_major__ >= 16)
 SortedItems<Item>::iterator
+#else
+typename SortedItems<Item>::iterator
+#endif
 DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter(
+#if defined(__clang__) && (__clang_major__ >= 16)
     SortedItems<Item>::iterator iter,
+#else
+    typename SortedItems<Item>::iterator iter,
+#endif
     SortedItems<Item>& cache,
     IterMap<Id, Item>& iter_map) {
   CHECK(iter != cache.end());