summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/gtk/bookmark_manager_gtk.cc2
-rw-r--r--chrome/browser/gtk/menu_gtk.cc8
-rw-r--r--chrome/browser/history/snippet.cc5
-rw-r--r--chrome/browser/zygote_main_linux.cc2
-rw-r--r--chrome/renderer/renderer_webkitclient_impl.cc2
-rw-r--r--media/base/video_frame_impl.cc3
-rw-r--r--net/base/file_stream_posix.cc4
-rw-r--r--net/disk_cache/mapped_file_posix.cc4
8 files changed, 16 insertions, 14 deletions
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc
index ef58e88..a59e8ab 100644
--- a/chrome/browser/gtk/bookmark_manager_gtk.cc
+++ b/chrome/browser/gtk/bookmark_manager_gtk.cc
@@ -1273,7 +1273,7 @@ void BookmarkManagerGtk::OnExportItemActivated(GtkMenuItem* menuitem,
void BookmarkManagerGtk::FileSelected(const FilePath& path,
int index, void* params) {
- int id = reinterpret_cast<int>(params);
+ int id = reinterpret_cast<intptr_t>(params);
if (id == IDS_BOOKMARK_MANAGER_IMPORT_MENU) {
// ImporterHost is ref counted and will delete itself when done.
ImporterHost* host = new ImporterHost();
diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc
index 9826110..f1b8f9a 100644
--- a/chrome/browser/gtk/menu_gtk.cc
+++ b/chrome/browser/gtk/menu_gtk.cc
@@ -233,8 +233,8 @@ void MenuGtk::OnMenuItemActivated(GtkMenuItem* menuitem, MenuGtk* menu) {
if (data) {
id = data->id;
} else {
- id = reinterpret_cast<int>(g_object_get_data(G_OBJECT(menuitem),
- "menu-id"));
+ id = reinterpret_cast<intptr_t>(g_object_get_data(G_OBJECT(menuitem),
+ "menu-id"));
}
// The menu item can still be activated by hotkeys even if it is disabled.
@@ -309,8 +309,8 @@ void MenuGtk::SetMenuItemInfo(GtkWidget* widget, gpointer userdata) {
if (data) {
id = data->id;
} else {
- id = reinterpret_cast<int>(
- g_object_get_data(G_OBJECT(widget), "menu-id"));
+ id = reinterpret_cast<intptr_t>(g_object_get_data(G_OBJECT(widget),
+ "menu-id"));
}
if (GTK_IS_CHECK_MENU_ITEM(widget)) {
diff --git a/chrome/browser/history/snippet.cc b/chrome/browser/history/snippet.cc
index 10e1481..c55761d 100644
--- a/chrome/browser/history/snippet.cc
+++ b/chrome/browser/history/snippet.cc
@@ -150,8 +150,9 @@ bool IsNextMatchWithinSnippetWindow(BreakIterator* bi,
// heuristics to speed things up if necessary, but it's not likely that
// we need to bother.
bi->next(kSnippetContext);
- int64_t current = bi->current();
- return (next_match_start < current || current == BreakIterator::DONE);
+ int64 current = bi->current();
+ return (next_match_start < static_cast<uint64>(current) ||
+ current == BreakIterator::DONE);
}
} // namespace
diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc
index 7c50e148..a163550 100644
--- a/chrome/browser/zygote_main_linux.cc
+++ b/chrome/browser/zygote_main_linux.cc
@@ -318,7 +318,7 @@ static bool MaybeEnterChroot() {
const char* locale = setlocale(LC_ALL, "");
LOG_IF(WARNING, locale == NULL) << "setlocale failed.";
-#if defined(ARCH_CPU_X86_FAMILY)
+#if defined(ARCH_CPU_X86)
PATCH_GLOBAL_OFFSET_TABLE(localtime, sandbox_wrapper::localtime);
PATCH_GLOBAL_OFFSET_TABLE(localtime_r, sandbox_wrapper::localtime_r);
#endif
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index f14a4cf..c086d0d 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -51,7 +51,7 @@ bool RendererWebKitClientImpl::getFileSize(const WebString& path,
long long& result) {
if (RenderThread::current()->Send(new ViewHostMsg_GetFileSize(
FilePath(webkit_glue::WebStringToFilePathString(path)),
- &result))) {
+ reinterpret_cast<int64*>(&result)))) {
return result >= 0;
} else {
result = -1;
diff --git a/media/base/video_frame_impl.cc b/media/base/video_frame_impl.cc
index d132d0c..aabda6c 100644
--- a/media/base/video_frame_impl.cc
+++ b/media/base/video_frame_impl.cc
@@ -67,7 +67,8 @@ bool VideoFrameImpl::AllocateRGB(size_t bytes_per_pixel) {
surface_.data[VideoSurface::kRGBPlane] = new uint8[bytes_per_row *
surface_.height];
DCHECK(surface_.data[VideoSurface::kRGBPlane]);
- DCHECK(!(reinterpret_cast<int>(surface_.data[VideoSurface::kRGBPlane]) & 7));
+ DCHECK(!(reinterpret_cast<intptr_t>(
+ surface_.data[VideoSurface::kRGBPlane]) & 7));
COMPILE_ASSERT(0 == VideoSurface::kRGBPlane, RGB_data_must_be_index_0);
return (NULL != surface_.data[VideoSurface::kRGBPlane]);
}
diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc
index fbfeb04..5c55781 100644
--- a/net/base/file_stream_posix.cc
+++ b/net/base/file_stream_posix.cc
@@ -382,7 +382,7 @@ int FileStream::Read(
return ERR_UNEXPECTED;
// read(..., 0) will return 0, which indicates end-of-file.
- DCHECK(buf_len > 0 && buf_len <= SSIZE_MAX);
+ DCHECK(buf_len > 0);
DCHECK(open_flags_ & base::PLATFORM_FILE_READ);
if (async_context_.get()) {
@@ -420,7 +420,7 @@ int FileStream::ReadUntilComplete(char *buf, int buf_len) {
int FileStream::Write(
const char* buf, int buf_len, CompletionCallback* callback) {
// write(..., 0) will return 0, which indicates end-of-file.
- DCHECK(buf_len > 0 && buf_len <= SSIZE_MAX);
+ DCHECK(buf_len > 0);
if (!IsOpen())
return ERR_UNEXPECTED;
diff --git a/net/disk_cache/mapped_file_posix.cc b/net/disk_cache/mapped_file_posix.cc
index b9d8435..a28a7d4 100644
--- a/net/disk_cache/mapped_file_posix.cc
+++ b/net/disk_cache/mapped_file_posix.cc
@@ -23,8 +23,8 @@ void* MappedFile::Init(const std::wstring& name, size_t size) {
buffer_ = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
platform_file(), 0);
init_ = true;
- DCHECK(reinterpret_cast<int>(buffer_) != -1);
- if (reinterpret_cast<int>(buffer_) == -1)
+ DCHECK(reinterpret_cast<intptr_t>(buffer_) != -1);
+ if (reinterpret_cast<intptr_t>(buffer_) == -1)
buffer_ = 0;
view_size_ = size;
generated by cgit v1.1 at 2025-02-13 18:11:23 +0000