From 5a64b081be1eb80f1bcf1f76e07de24f31ba0996 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Sun, 28 Feb 2010 19:21:55 -0800 Subject: [PATCH] Cast cleanup. --- src/io/sys.cpp | 3 +-- src/ui/dialog/filedialogimpl-win32.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/io/sys.cpp b/src/io/sys.cpp index f25575c9c..34160b648 100644 --- a/src/io/sys.cpp +++ b/src/io/sys.cpp @@ -412,10 +412,9 @@ dup_noninherited (int fd, GetCurrentProcess (), &filehandle, 0, FALSE, DUPLICATE_SAME_ACCESS); close (fd); - return _open_osfhandle ((LONG_PTR) filehandle, mode | _O_NOINHERIT); + return _open_osfhandle(reinterpret_cast(filehandle), mode | _O_NOINHERIT); } - /* The helper process writes a status report back to us, through a * pipe, consisting of two ints. */ diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index 3cdd61184..0f3672f25 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -455,14 +455,14 @@ UINT_PTR CALLBACK FileOpenDialogImplWin32::GetOpenFileName_hookproc( // Subclass the parent pImpl->_base_window_proc = (WNDPROC)GetWindowLongPtr(hParentWnd, GWLP_WNDPROC); - SetWindowLongPtr(hParentWnd, GWLP_WNDPROC, (LONG_PTR)file_dialog_subclass_proc); + SetWindowLongPtr(hParentWnd, GWLP_WNDPROC, reinterpret_cast(file_dialog_subclass_proc)); // Add a button to the toolbar pImpl->_toolbar_wnd = FindWindowEx(hParentWnd, NULL, "ToolbarWindow32", NULL); pImpl->_show_preview_button_bitmap = LoadBitmap( hInstance, MAKEINTRESOURCE(IDC_SHOW_PREVIEW)); - TBADDBITMAP tbAddBitmap = {NULL, (UINT_PTR)pImpl->_show_preview_button_bitmap}; + TBADDBITMAP tbAddBitmap = {NULL, reinterpret_cast(pImpl->_show_preview_button_bitmap)}; const int iBitmapIndex = SendMessage(pImpl->_toolbar_wnd, TB_ADDBITMAP, 1, (LPARAM)&tbAddBitmap); -- 2.30.2