void-packages/srcpkgs/chromium/patches/set-clash.patch

30 lines
936 B
Diff

--- chrome/browser/devtools/devtools_file_system_indexer.cc.orig 2017-09-15 11:30:41.000000000 +0000
+++ chrome/browser/devtools/devtools_file_system_indexer.cc 2017-09-15 11:31:27.807511773 +0000
@@ -34,7 +34,7 @@
using base::TimeTicks;
using content::BrowserThread;
using std::map;
-using std::set;
+//using std::set;
using std::string;
using std::vector;
@@ -191,7 +191,7 @@
if (trigram != kUndefinedTrigram)
trigrams.push_back(trigram);
}
- set<FileId> file_ids;
+ std::set<FileId> file_ids;
bool first = true;
vector<Trigram>::const_iterator it = trigrams.begin();
for (; it != trigrams.end(); ++it) {
@@ -203,7 +203,7 @@
first = false;
continue;
}
- set<FileId> intersection = base::STLSetIntersection<set<FileId> >(
+ std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >(
file_ids, index_[trigram]);
file_ids.swap(intersection);
}