From 23df969355caed40d16791d22ad35929a6553f9b Mon Sep 17 00:00:00 2001 From: "j.isorce" Date: Tue, 26 Jan 2016 01:08:51 -0800 Subject: Fix build error with gcc 4.8.2 about WARN_UNUSED_RESULT For static methods it does not seem to work properly with older gcc. Indeed the compiler consider the result as not used in this example: sequence_token_ = BrowserThread::GetBlockingPool()->GetSequenceToken() "error: ignoring return value of 'static base::SequencedWorkerPool* content::BrowserThread::GetBlockingPool()', declared with attribute warn_unused_result [-Werror=unused-result]" The solution is just to call GetSequenceToken() directly as: base::SequencedWorkerPool::GetSequenceToken() as it is static. BUG=579461 R=cpu@chromium.org, nico@chromium.org TEST= GYP_DEFINES="clang=0 use_sysroot=0" Review URL: https://codereview.chromium.org/1610103002 Cr-Commit-Position: refs/heads/master@{#371479} --- .../browser/component_updater/chrome_component_updater_configurator.cc | 2 +- chrome/browser/dom_distiller/dom_distiller_service_factory.cc | 2 +- chrome/browser/profiles/profile_impl_io_data.cc | 2 +- chrome/browser/search/suggestions/suggestions_service_factory.cc | 2 +- components/visitedlink/browser/visitedlink_master.cc | 2 +- extensions/browser/updater/update_client_config.cc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chrome/browser/component_updater/chrome_component_updater_configurator.cc b/chrome/browser/component_updater/chrome_component_updater_configurator.cc index eb0d783..1ce7601 100644 --- a/chrome/browser/component_updater/chrome_component_updater_configurator.cc +++ b/chrome/browser/component_updater/chrome_component_updater_configurator.cc @@ -131,7 +131,7 @@ scoped_refptr ChromeConfigurator::GetSequencedTaskRunner() const { return content::BrowserThread::GetBlockingPool() ->GetSequencedTaskRunnerWithShutdownBehavior( - content::BrowserThread::GetBlockingPool()->GetSequenceToken(), + base::SequencedWorkerPool::GetSequenceToken(), base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN); } diff --git a/chrome/browser/dom_distiller/dom_distiller_service_factory.cc b/chrome/browser/dom_distiller/dom_distiller_service_factory.cc index 5178d41..6c194b1 100644 --- a/chrome/browser/dom_distiller/dom_distiller_service_factory.cc +++ b/chrome/browser/dom_distiller/dom_distiller_service_factory.cc @@ -55,7 +55,7 @@ KeyedService* DomDistillerServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { scoped_refptr background_task_runner = content::BrowserThread::GetBlockingPool()->GetSequencedTaskRunner( - content::BrowserThread::GetBlockingPool()->GetSequenceToken()); + base::SequencedWorkerPool::GetSequenceToken()); scoped_ptr > db( new leveldb_proto::ProtoDatabaseImpl( diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc index 0cfe7e8..286bb98 100644 --- a/chrome/browser/profiles/profile_impl_io_data.cc +++ b/chrome/browser/profiles/profile_impl_io_data.cc @@ -508,7 +508,7 @@ void ProfileImplIOData::InitializeInternal( new QuotaPolicyChannelIDStore( lazy_params_->channel_id_path, BrowserThread::GetBlockingPool()->GetSequencedTaskRunner( - BrowserThread::GetBlockingPool()->GetSequenceToken()), + base::SequencedWorkerPool::GetSequenceToken()), lazy_params_->special_storage_policy.get()); channel_id_service = new net::ChannelIDService( new net::DefaultChannelIDStore(channel_id_db.get()), diff --git a/chrome/browser/search/suggestions/suggestions_service_factory.cc b/chrome/browser/search/suggestions/suggestions_service_factory.cc index bd65512..8a3fd8d 100644 --- a/chrome/browser/search/suggestions/suggestions_service_factory.cc +++ b/chrome/browser/search/suggestions/suggestions_service_factory.cc @@ -57,7 +57,7 @@ KeyedService* SuggestionsServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { scoped_refptr background_task_runner = BrowserThread::GetBlockingPool()->GetSequencedTaskRunner( - BrowserThread::GetBlockingPool()->GetSequenceToken()); + base::SequencedWorkerPool::GetSequenceToken()); Profile* the_profile = static_cast(profile); diff --git a/components/visitedlink/browser/visitedlink_master.cc b/components/visitedlink/browser/visitedlink_master.cc index 4328700..70dfd1f 100644 --- a/components/visitedlink/browser/visitedlink_master.cc +++ b/components/visitedlink/browser/visitedlink_master.cc @@ -282,7 +282,7 @@ void VisitedLinkMaster::InitMembers() { used_items_ = 0; table_size_override_ = 0; suppress_rebuild_ = false; - sequence_token_ = BrowserThread::GetBlockingPool()->GetSequenceToken(); + sequence_token_ = base::SequencedWorkerPool::GetSequenceToken(); } bool VisitedLinkMaster::Init() { diff --git a/extensions/browser/updater/update_client_config.cc b/extensions/browser/updater/update_client_config.cc index 3e5e1b1..36ab34f 100644 --- a/extensions/browser/updater/update_client_config.cc +++ b/extensions/browser/updater/update_client_config.cc @@ -14,7 +14,7 @@ scoped_refptr UpdateClientConfig::GetSequencedTaskRunner() const { return content::BrowserThread::GetBlockingPool() ->GetSequencedTaskRunnerWithShutdownBehavior( - content::BrowserThread::GetBlockingPool()->GetSequenceToken(), + base::SequencedWorkerPool::GetSequenceToken(), base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); } -- cgit v1.1