mirror of
https://git.freebsd.org/ports.git
synced 2025-06-08 22:30:38 -04:00
fde2530e82
Changelog: https://chromium.googlesource.com/chromium/src/+log/74.0.3729.169..75.0.3770.80?pretty=fuller&n=10000 Submitted by: Matthias Wolf <matthias@rheinwolf.de>
87 lines
4.2 KiB
Text
87 lines
4.2 KiB
Text
--- base/strings/safe_sprintf_unittest.cc.orig 2019-03-11 22:00:51 UTC
|
|
+++ base/strings/safe_sprintf_unittest.cc
|
|
@@ -730,6 +730,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
|
|
}
|
|
|
|
TEST(SafeSPrintfTest, EmitNULL) {
|
|
+/* Avoid compiler error: http://pastebin.com/1edWUE84
|
|
char buf[40];
|
|
#if defined(__GNUC__)
|
|
#pragma GCC diagnostic push
|
|
@@ -741,6 +742,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
|
|
EXPECT_EQ("0x0", std::string(buf));
|
|
EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL));
|
|
EXPECT_EQ("<NULL>", std::string(buf));
|
|
+*/
|
|
#if defined(__GCC__)
|
|
#pragma GCC diagnostic pop
|
|
#endif
|
|
--- base/threading/thread_local_storage_unittest.cc.orig 2019-03-11 22:00:51 UTC
|
|
+++ base/threading/thread_local_storage_unittest.cc
|
|
@@ -86,7 +86,7 @@ class ThreadLocalStorageRunner : public DelegateSimple
|
|
void ThreadLocalStorageCleanup(void *value) {
|
|
int *ptr = reinterpret_cast<int*>(value);
|
|
// Destructors should never be called with a NULL.
|
|
- ASSERT_NE(reinterpret_cast<int*>(NULL), ptr);
|
|
+ ASSERT_NE(static_cast<int*>(NULL), ptr);
|
|
if (*ptr == kFinalTlsValue)
|
|
return; // We've been called enough times.
|
|
ASSERT_LT(kFinalTlsValue, *ptr);
|
|
--- media/audio/audio_output_proxy_unittest.cc.orig 2019-03-11 22:00:59 UTC
|
|
+++ media/audio/audio_output_proxy_unittest.cc
|
|
@@ -410,7 +410,7 @@ class AudioOutputProxyTest : public testing::Test {
|
|
// |stream| is closed at this point. Start() should reopen it again.
|
|
EXPECT_CALL(manager(), MakeAudioOutputStream(_, _, _))
|
|
.Times(2)
|
|
- .WillRepeatedly(Return(reinterpret_cast<AudioOutputStream*>(NULL)));
|
|
+ .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL)));
|
|
|
|
EXPECT_CALL(callback_, OnError()).Times(2);
|
|
|
|
--- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc.orig 2019-03-11 22:08:03 UTC
|
|
+++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc
|
|
@@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder(
|
|
}
|
|
|
|
CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id)
|
|
- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
|
|
+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
|
|
CMapFormat::kFormat0,
|
|
cmap_id) {
|
|
}
|
|
@@ -563,7 +563,7 @@ CMapTable::CMapFormat2::Builder::Builder(WritableFontD
|
|
: CMapTable::CMap::Builder(data ? down_cast<WritableFontData*>(
|
|
data->Slice(offset, data->ReadUShort(
|
|
offset + Offset::kFormat0Length)))
|
|
- : reinterpret_cast<WritableFontData*>(NULL),
|
|
+ : static_cast<WritableFontData*>(NULL),
|
|
CMapFormat::kFormat2, cmap_id) {
|
|
// TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix.
|
|
}
|
|
@@ -574,7 +574,7 @@ CMapTable::CMapFormat2::Builder::Builder(ReadableFontD
|
|
: CMapTable::CMap::Builder(data ? down_cast<ReadableFontData*>(
|
|
data->Slice(offset, data->ReadUShort(
|
|
offset + Offset::kFormat0Length)))
|
|
- : reinterpret_cast<ReadableFontData*>(NULL),
|
|
+ : static_cast<ReadableFontData*>(NULL),
|
|
CMapFormat::kFormat2, cmap_id) {
|
|
// TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix.
|
|
}
|
|
@@ -958,7 +958,7 @@ CMapTable::CMapFormat4::Builder::Builder(WritableFontD
|
|
CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments,
|
|
std::vector<int32_t>* glyph_id_array,
|
|
const CMapId& cmap_id)
|
|
- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
|
|
+ : CMap::Builder(static_cast<ReadableFontData*>(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(SegmentList*
|
|
}
|
|
|
|
CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id)
|
|
- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
|
|
+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
|
|
CMapFormat::kFormat4, cmap_id) {
|
|
}
|
|
|