diff options
Diffstat (limited to 'www/chromium/files/extra-patch-clang')
| -rw-r--r-- | www/chromium/files/extra-patch-clang | 55 |
1 files changed, 22 insertions, 33 deletions
diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang index fe598858ae0a..465cde2e599d 100644 --- a/www/chromium/files/extra-patch-clang +++ b/www/chromium/files/extra-patch-clang @@ -89,17 +89,6 @@ const TrackedTime kTimePosted = TrackedTime() + Duration::FromMilliseconds(1); const TrackedTime kStartOfRun = TrackedTime() + ---- chrome/browser/metrics/thread_watcher.cc 2013-07-03 23:45:55.000000000 -0400 -+++ chrome/browser/metrics/thread_watcher.cc 2013-07-19 01:38:45.000000000 -0400 -@@ -41,7 +41,7 @@ - MSVC_PUSH_DISABLE_WARNING(4748) - - int* NullPointer() { -- return reinterpret_cast<int*>(NULL); -+ return static_cast<int*>(NULL); - } - - void NullPointerCrash(int line_number) { --- chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-03 23:46:07.000000000 -0400 +++ chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-19 01:50:13.000000000 -0400 @@ -260,7 +260,7 @@ @@ -122,17 +111,17 @@ EXPECT_CALL(callback_, OnError(_)) .Times(2); ---- media/filters/decrypting_video_decoder_unittest.cc.orig 2013-08-30 23:27:39.000000000 +0300 -+++ media/filters/decrypting_video_decoder_unittest.cc 2013-08-30 23:28:27.000000000 +0300 -@@ -417,7 +417,7 @@ - // callback to cancel the |decryptor_ready_cb|. - EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())) - .WillOnce(ResetAndRunCallback(&decryptor_ready_cb, -- reinterpret_cast<Decryptor*>(NULL))); -+ static_cast<Decryptor*>(NULL))); - Stop(); - } - +--- media/filters/decrypting_video_decoder_unittest.cc.orig 2014-09-04 02:04:17.000000000 +0200 ++++ media/filters/decrypting_video_decoder_unittest.cc 2014-09-08 20:51:21.000000000 +0200 +@@ -420,7 +420,7 @@ + // NULL callback to cancel the |decryptor_ready_cb|. + EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())).WillOnce( + ResetAndRunCallback(&decryptor_ready_cb, +- reinterpret_cast<Decryptor*>(NULL), ++ static_cast<Decryptor*>(NULL), + base::Bind(&DecryptingVideoDecoderTest::DecryptorSet, + base::Unretained(this)))); + EXPECT_CALL(*this, DecryptorSet(_)).Times(0); --- 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 @@ @@ -153,17 +142,6 @@ char * check_twosfx_morph(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); ---- third_party/libjingle/source/talk/base/taskrunner.cc 2013-07-03 23:54:05.000000000 -0400 -+++ third_party/libjingle/source/talk/base/taskrunner.cc 2013-07-19 00:46:25.000000000 -0400 -@@ -119,7 +119,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()); - --- third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2013-07-03 23:54:15.000000000 -0400 +++ third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2013-07-19 00:44:09.000000000 -0400 @@ -439,7 +439,7 @@ @@ -278,3 +256,14 @@ tasks_.erase(it, tasks_.end()); +--- v8/src/unique.h.orig 2014-09-04 02:30:24.000000000 +0200 ++++ v8/src/unique.h 2014-09-10 16:19:37.000000000 +0200 +@@ -167,7 +167,7 @@ + + // TODO(titzer): this is a hack to migrate to Unique<T> incrementally. + static PrintableUnique<T> CreateUninitialized(Zone* zone, Handle<T> handle) { +- return PrintableUnique<T>(zone, reinterpret_cast<Address>(NULL), handle); ++ return PrintableUnique<T>(zone, static_cast<Address>(NULL), handle); + } + + static PrintableUnique<T> CreateImmovable(Zone* zone, Handle<T> handle) { |