From 7e93e2f52a534ff2fb1434ae7bca88dc8bd8e4df Mon Sep 17 00:00:00 2001 From: "craig.schlenter@chromium.org" Date: Mon, 7 Sep 2009 19:01:41 +0000 Subject: Fix some gcc 4.4 issues when compiling with toolkit_views. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Most of these squash harmless compiler warnings but the custom_button.cc change fixes a real problem with the accelerator key bitmask calculation (+ preceeds << in terms of operator precedence) The change to tab_strip.cc is ugly but it fixes the following error: chrome/browser/views/tabs/tab_strip.cc: In member function ‘void TabStrip::StartRemoveTabAnimation(int, TabContents*)’: chrome/browser/views/tabs/tab_strip.cc:201: error: assuming signed overflow does not occur when assuming that (X - c) > X is always false As an added bonus, this makes the Linux shared build of toolkit_views work too. Review URL: http://codereview.chromium.org/199025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25602 0039d316-1c4b-4281-b951-d872f2087c98 --- app/os_exchange_data_provider_gtk.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'app/os_exchange_data_provider_gtk.cc') diff --git a/app/os_exchange_data_provider_gtk.cc b/app/os_exchange_data_provider_gtk.cc index f432c7c..5b32907 100644 --- a/app/os_exchange_data_provider_gtk.cc +++ b/app/os_exchange_data_provider_gtk.cc @@ -164,7 +164,7 @@ void OSExchangeDataProviderGtk::SetHtml(const std::wstring& html, } bool OSExchangeDataProviderGtk::GetString(std::wstring* data) const { - if (formats_ & OSExchangeData::STRING == 0) + if ((formats_ & OSExchangeData::STRING) == 0) return false; *data = UTF16ToWideHack(string_); return true; @@ -172,7 +172,7 @@ bool OSExchangeDataProviderGtk::GetString(std::wstring* data) const { bool OSExchangeDataProviderGtk::GetURLAndTitle(GURL* url, std::wstring* title) const { - if (formats_ & OSExchangeData::URL == 0) + if ((formats_ & OSExchangeData::URL) == 0) return false; if (!url_.is_valid()) return false; @@ -183,7 +183,7 @@ bool OSExchangeDataProviderGtk::GetURLAndTitle(GURL* url, } bool OSExchangeDataProviderGtk::GetFilename(std::wstring* full_path) const { - if (formats_ & OSExchangeData::FILE_NAME == 0) + if ((formats_ & OSExchangeData::FILE_NAME) == 0) return false; *full_path = UTF16ToWideHack(filename_); return true; @@ -202,7 +202,7 @@ bool OSExchangeDataProviderGtk::GetPickledData(GdkAtom format, bool OSExchangeDataProviderGtk::GetFileContents( std::wstring* filename, std::string* file_contents) const { - if (formats_ & OSExchangeData::FILE_CONTENTS == 0) + if ((formats_ & OSExchangeData::FILE_CONTENTS) == 0) return false; *filename = UTF16ToWideHack(filename_); *file_contents = file_contents_; @@ -211,7 +211,7 @@ bool OSExchangeDataProviderGtk::GetFileContents( bool OSExchangeDataProviderGtk::GetHtml(std::wstring* html, GURL* base_url) const { - if (formats_ & OSExchangeData::HTML == 0) + if ((formats_ & OSExchangeData::HTML) == 0) return false; *html = UTF16ToWideHack(filename_); *base_url = base_url_; -- cgit v1.1