--- base/allocator/allocator_extension.cc 2013-07-03 23:39:54.000000000 -0400 +++ base/allocator/allocator_extension.cc 2013-07-19 00:39:26.000000000 -0400 @@ -35,20 +35,20 @@ void SetGetAllocatorWasteSizeFunction( thunks::GetAllocatorWasteSizeFunction get_allocator_waste_size_function) { DCHECK_EQ(thunks::GetGetAllocatorWasteSizeFunction(), - reinterpret_cast(NULL)); + static_cast(NULL)); thunks::SetGetAllocatorWasteSizeFunction(get_allocator_waste_size_function); } void SetGetStatsFunction(thunks::GetStatsFunction get_stats_function) { DCHECK_EQ(thunks::GetGetStatsFunction(), - reinterpret_cast(NULL)); + static_cast(NULL)); thunks::SetGetStatsFunction(get_stats_function); } void SetReleaseFreeMemoryFunction( thunks::ReleaseFreeMemoryFunction release_free_memory_function) { DCHECK_EQ(thunks::GetReleaseFreeMemoryFunction(), - reinterpret_cast(NULL)); + static_cast(NULL)); thunks::SetReleaseFreeMemoryFunction(release_free_memory_function); } --- base/profiler/alternate_timer.cc 2013-07-03 23:39:54.000000000 -0400 +++ base/profiler/alternate_timer.cc 2013-07-19 00:41:06.000000000 -0400 @@ -21,7 +21,7 @@ // Set an alternate timer function to replace the OS time function when // profiling. void SetAlternateTimeSource(NowFunction* now_function, TimeSourceType type) { - DCHECK_EQ(reinterpret_cast(NULL), g_time_function); + DCHECK_EQ(static_cast(NULL), g_time_function); g_time_function = now_function; g_time_source_type = type; } --- base/threading/thread_local_storage_unittest.cc.orig 2013-08-30 23:06:21.000000000 +0300 +++ base/threading/thread_local_storage_unittest.cc 2013-08-30 23:06:50.000000000 +0300 @@ -60,7 +60,7 @@ void ThreadLocalStorageCleanup(void *value) { int *ptr = reinterpret_cast(value); // Destructors should never be called with a NULL. - ASSERT_NE(reinterpret_cast(NULL), ptr); + ASSERT_NE(static_cast(NULL), ptr); if (*ptr == kFinalTlsValue) return; // We've been called enough times. ASSERT_LT(kFinalTlsValue, *ptr); --- base/tracked_objects.cc 2013-07-03 23:39:54.000000000 -0400 +++ base/tracked_objects.cc 2013-07-19 00:42:10.000000000 -0400 @@ -378,7 +378,7 @@ } // We must NOT do any allocations during this callback. // Using the simple linked lists avoids all allocations. - DCHECK_EQ(this->next_retired_worker_, reinterpret_cast(NULL)); + DCHECK_EQ(this->next_retired_worker_, static_cast(NULL)); this->next_retired_worker_ = first_retired_worker_; first_retired_worker_ = this; } --- base/tracked_objects_unittest.cc.orig 2013-08-30 23:09:01.000000000 +0300 +++ base/tracked_objects_unittest.cc 2013-08-30 23:10:14.000000000 +0300 @@ -53,9 +53,9 @@ Births* birth = ThreadData::TallyABirthIfActive(location); if (ThreadData::status() == ThreadData::DEACTIVATED) - EXPECT_EQ(reinterpret_cast(NULL), birth); + EXPECT_EQ(static_cast(NULL), birth); else - EXPECT_NE(reinterpret_cast(NULL), birth); + EXPECT_NE(static_cast(NULL), birth); } // Helper function to verify the most common test expectations. @@ -234,7 +234,7 @@ return; scoped_ptr data(new DeathData()); - ASSERT_NE(data, reinterpret_cast(NULL)); + ASSERT_NE(data, static_cast(NULL)); EXPECT_EQ(data->run_duration_sum(), 0); EXPECT_EQ(data->run_duration_sample(), 0); EXPECT_EQ(data->queue_duration_sum(), 0); @@ -435,7 +435,7 @@ Location location(kFunction, kFile, kLineNumber, NULL); // Do not delete |birth|. We don't own it. Births* birth = ThreadData::TallyABirthIfActive(location); - EXPECT_NE(reinterpret_cast(NULL), birth); + EXPECT_NE(static_cast(NULL), birth); const TrackedTime kTimePosted = TrackedTime() + Duration::FromMilliseconds(1); const TrackedTime kStartOfRun = TrackedTime() + --- 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 @@ } DCHECK(window_ptr); DCHECK_EQ(window_ptr->window_id.id(), window_id); - DCHECK_EQ(reinterpret_cast(NULL), + DCHECK_EQ(static_cast(NULL), GetSession(session_tag)->windows[window_id]); GetSession(session_tag)->windows[window_id] = window_ptr; } --- media/audio/audio_output_proxy_unittest.cc.orig 2013-08-30 23:23:03.000000000 +0300 +++ media/audio/audio_output_proxy_unittest.cc 2013-08-30 23:23:54.000000000 +0300 @@ -392,7 +392,7 @@ // |stream| is closed at this point. Start() should reopen it again. EXPECT_CALL(manager(), MakeAudioOutputStream(_, _)) .Times(2) - .WillRepeatedly(Return(reinterpret_cast(NULL))); + .WillRepeatedly(Return(static_cast(NULL))); EXPECT_CALL(callback_, OnError(_)) .Times(2); --- 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(NULL), + static_cast(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 @@ struct hentry * checkword(const char * word, int len, char in_compound, const FLAG needflag = FLAG_NULL); - struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL); + struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = 0); char * check_morph(const char * word, int len, char in_compound, const FLAG needflag = FLAG_NULL); @@ -90,7 +90,7 @@ // const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT); const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0); - struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL); + struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = 0); char * check_twosfx_morph(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); --- 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 @@ } CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat0, cmap_id) { } @@ -563,7 +563,7 @@ : CMapTable::CMap::Builder(data ? down_cast( data->Slice(offset, data->ReadUShort( offset + Offset::kFormat0Length))) - : reinterpret_cast(NULL), + : static_cast(NULL), CMapFormat::kFormat2, cmap_id) { // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. } @@ -574,7 +574,7 @@ : CMapTable::CMap::Builder(data ? down_cast( data->Slice(offset, data->ReadUShort( offset + Offset::kFormat0Length))) - : reinterpret_cast(NULL), + : static_cast(NULL), CMapFormat::kFormat2, cmap_id) { // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. } @@ -958,7 +958,7 @@ CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments, IntegerList* glyph_id_array, const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat4, cmap_id), segments_(segments->begin(), segments->end()), glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) { @@ -966,7 +966,7 @@ } CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat4, cmap_id) { } --- v8/src/runtime.cc.orig 2013-11-08 08:01:04.000000000 +0100 +++ v8/src/runtime.cc 2013-11-15 13:17:39.000000000 +0100 @@ -14043,7 +14043,7 @@ local_object->SetInternalField(0, reinterpret_cast(break_iterator)); // Make sure that the pointer to adopted text is NULL. - local_object->SetInternalField(1, reinterpret_cast(NULL)); + local_object->SetInternalField(1, static_cast(NULL)); RETURN_IF_EMPTY_HANDLE(isolate, JSObject::SetLocalPropertyIgnoreAttributes( --- base/strings/safe_sprintf_unittest.cc.orig 2013-11-08 07:42:08.000000000 +0100 +++ base/strings/safe_sprintf_unittest.cc 2013-11-15 15:04:45.000000000 +0100 @@ -721,12 +721,14 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wconversion-null" #endif +/* Avoid compiler error: http://pastebin.com/1edWUE84 EXPECT_EQ(1, SafeSPrintf(buf, "%d", NULL)); EXPECT_EQ("0", std::string(buf)); EXPECT_EQ(3, SafeSPrintf(buf, "%p", NULL)); EXPECT_EQ("0x0", std::string(buf)); EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL)); EXPECT_EQ("", std::string(buf)); +*/ #if defined(__GCC__) #pragma GCC diagnostic pop #endif --- v8/src/unique.h.orig 2014-01-07 21:03:55.000000000 +0100 +++ v8/src/unique.h 2014-01-13 00:41:59.000000000 +0100 @@ -130,7 +130,7 @@ // TODO(titzer): this is a hack to migrate to Unique incrementally. static Unique CreateUninitialized(Handle handle) { - return Unique(reinterpret_cast
(NULL), handle); + return Unique(static_cast
(NULL), handle); } static Unique CreateImmovable(Handle handle) { --- content/browser/frame_host/render_widget_host_view_guest.cc.orig 2014-03-05 22:24:07.000000000 +0100 +++ content/browser/frame_host/render_widget_host_view_guest.cc 2014-03-09 20:01:20.000000000 +0100 @@ -258,11 +258,11 @@ gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const { if (!guest_) - return static_cast(NULL); + return reinterpret_cast(NULL); RenderWidgetHostView* rwhv = guest_->GetEmbedderRenderWidgetHostView(); if (!rwhv) - return static_cast(NULL); + return reinterpret_cast(NULL); return rwhv->GetNativeViewId(); } - --- ./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::iterator it; it = std::remove(tasks_.begin(), tasks_.end(), - reinterpret_cast(NULL)); + static_cast(NULL)); 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 incrementally. static PrintableUnique CreateUninitialized(Zone* zone, Handle handle) { - return PrintableUnique(zone, reinterpret_cast
(NULL), handle); + return PrintableUnique(zone, static_cast
(NULL), handle); } static PrintableUnique CreateImmovable(Zone* zone, Handle handle) {