summaryrefslogtreecommitdiff
path: root/www/chromium/files/extra-patch-clang
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/extra-patch-clang')
-rw-r--r--www/chromium/files/extra-patch-clang22
1 files changed, 11 insertions, 11 deletions
diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang
index 6373e21396c8..fe598858ae0a 100644
--- a/www/chromium/files/extra-patch-clang
+++ b/www/chromium/files/extra-patch-clang
@@ -133,17 +133,6 @@
Stop();
}
---- net/url_request/view_cache_helper_unittest.cc.orig 2013-09-01 00:33:32.000000000 +0300
-+++ net/url_request/view_cache_helper_unittest.cc 2013-09-01 00:34:02.000000000 +0300
-@@ -29,7 +29,7 @@
- };
-
- TestURLRequestContext::TestURLRequestContext()
-- : cache_(reinterpret_cast<HttpTransactionFactory*>(NULL), NULL,
-+ : cache_(static_cast<HttpTransactionFactory*>(NULL), NULL,
- HttpCache::DefaultBackend::InMemory(0)) {
- set_http_transaction_factory(&cache_);
- }
--- third_party/hunspell/src/hunspell/affentry.hxx 2013-07-03 23:52:32.000000000 -0400
+++ third_party/hunspell/src/hunspell/affentry.hxx 2013-07-19 01:31:57.000000000 -0400
@@ -27,7 +27,7 @@
@@ -278,3 +267,14 @@
}
-
+--- ./third_party/webrtc/base/taskrunner.cc.orig 2014-08-20 21:04:28.000000000 +0200
++++ ./third_party/webrtc/base/taskrunner.cc 2014-08-22 18:55:46.000000000 +0200
+@@ -102,7 +102,7 @@
+ std::vector<Task *>::iterator it;
+ it = std::remove(tasks_.begin(),
+ tasks_.end(),
+- reinterpret_cast<Task *>(NULL));
++ static_cast<Task *>(NULL));
+
+ tasks_.erase(it, tasks_.end());
+