|
 |
9debcb0 |
diff -up chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc.gcc5fix chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc
|
|
|
9debcb0 |
--- chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc.gcc5fix 2017-09-06 16:32:34.496782451 -0400
|
|
|
9debcb0 |
+++ chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc 2017-09-06 16:33:22.053865242 -0400
|
|
|
9debcb0 |
@@ -34,7 +34,6 @@ using base::TimeDelta;
|
|
|
9debcb0 |
using base::TimeTicks;
|
|
|
9debcb0 |
using content::BrowserThread;
|
|
|
9debcb0 |
using std::map;
|
|
|
9debcb0 |
-using std::set;
|
|
|
9debcb0 |
using std::string;
|
|
|
9debcb0 |
using std::vector;
|
|
|
9debcb0 |
|
|
|
9debcb0 |
@@ -191,7 +190,7 @@ vector<FilePath> Index::Search(const str
|
|
|
9debcb0 |
if (trigram != kUndefinedTrigram)
|
|
|
9debcb0 |
trigrams.push_back(trigram);
|
|
|
9debcb0 |
}
|
|
|
9debcb0 |
- set<FileId> file_ids;
|
|
|
9debcb0 |
+ std::set<FileId> file_ids;
|
|
|
9debcb0 |
bool first = true;
|
|
|
9debcb0 |
vector<Trigram>::const_iterator it = trigrams.begin();
|
|
|
9debcb0 |
for (; it != trigrams.end(); ++it) {
|
|
|
9debcb0 |
@@ -203,7 +202,7 @@ vector<FilePath> Index::Search(const str
|
|
|
9debcb0 |
first = false;
|
|
|
9debcb0 |
continue;
|
|
|
9debcb0 |
}
|
|
|
9debcb0 |
- set<FileId> intersection = base::STLSetIntersection<set<FileId> >(
|
|
|
9debcb0 |
+ std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >(
|
|
|
9debcb0 |
file_ids, index_[trigram]);
|
|
|
9debcb0 |
file_ids.swap(intersection);
|
|
|
9debcb0 |
}
|
|
|
9debcb0 |
diff -up chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5fix chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
|
|
|
9debcb0 |
--- chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5fix 2017-09-06 16:33:35.213611900 -0400
|
|
|
9debcb0 |
+++ chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h 2017-09-06 16:34:34.471469606 -0400
|
|
|
9debcb0 |
@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
|
|
|
9debcb0 |
allocation_length_(0),
|
|
|
9debcb0 |
data_(data),
|
|
|
9debcb0 |
data_length_(0),
|
|
|
9debcb0 |
- kind_(AllocationKind::kNormal),
|
|
|
9debcb0 |
+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
|
|
|
9debcb0 |
deleter_(deleter) {}
|
|
|
9debcb0 |
DataHandle(void* allocation_base,
|
|
|
9debcb0 |
size_t allocation_length,
|
|
|
9debcb0 |
@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
|
|
|
9debcb0 |
reinterpret_cast<uintptr_t>(allocation_base_) +
|
|
|
9debcb0 |
allocation_length_);
|
|
|
9debcb0 |
switch (kind_) {
|
|
|
9debcb0 |
- case AllocationKind::kNormal:
|
|
|
9debcb0 |
+ case WTF::ArrayBufferContents::AllocationKind::kNormal:
|
|
|
9debcb0 |
DCHECK(deleter_);
|
|
|
9debcb0 |
deleter_(data_);
|
|
|
9debcb0 |
return;
|
|
|
9debcb0 |
- case AllocationKind::kReservation:
|
|
|
9debcb0 |
+ case WTF::ArrayBufferContents::AllocationKind::kReservation:
|
|
|
9debcb0 |
ReleaseReservedMemory(allocation_base_, allocation_length_);
|
|
|
9debcb0 |
return;
|
|
|
9debcb0 |
}
|
|
|
9debcb0 |
diff -up chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5fix chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc
|
|
|
9debcb0 |
--- chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5fix 2017-09-06 16:34:51.959131969 -0400
|
|
|
9debcb0 |
+++ chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-09-06 16:35:03.027919336 -0400
|
|
|
9debcb0 |
@@ -10,7 +10,7 @@
|
|
|
9debcb0 |
|
|
|
9debcb0 |
#include "webrtc/modules/audio_processing/aec3/aec_state.h"
|
|
|
9debcb0 |
|
|
|
9debcb0 |
-#include <math.h>
|
|
|
9debcb0 |
+#include <cmath>
|
|
|
9debcb0 |
#include <numeric>
|
|
|
9debcb0 |
#include <vector>
|
|
|
9debcb0 |
|