|
|
Created:
4 years, 4 months ago by Mostyn Bramley-Moore Modified:
4 years, 4 months ago CC:
chromium-reviews, dcheng Base URL:
https://chromium.googlesource.com/chromium/src.git@master Target Ref:
refs/pending/heads/master Project:
chromium Visibility:
Public. |
Description(gcc) fix compilation of os_exchange_data_provider_aurax11.cc
This fixes a gcc compilation error in os_exchange_data_provider_aurax11.cc:
error: cannot convert 'ret' from type 'std::unique_ptr<ui::OSExchangeDataProviderAuraX11>'
to type 'std::unique_ptr<ui::OSExchangeDataProviderAuraX11>&&'
Tested with gcc 4.8.4.
Followup to https://codereview.chromium.org/2179813003
BUG=614037
Committed: https://crrev.com/3624c6c095108839db78c01dce92c731cf10b954
Cr-Commit-Position: refs/heads/master@{#408233}
Patch Set 1 #
Total comments: 2
Patch Set 2 : use std::move #Patch Set 3 : IWYU: <utility> #Messages
Total messages: 26 (16 generated)
The CQ bit was checked by mostynb@opera.com to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
mostynb@opera.com changed reviewers: + erg@chromium.org, sky@chromium.org
@sky, Elliot: please take a look at this GCC compile fixup after https://codereview.chromium.org/2179813003 Without this change, g++ fails to compile with this error: ../../ui/base/dragdrop/os_exchange_data_provider_aurax11.cc: In member function 'virtual std::unique_ptr<ui::OSExchangeData::Provider> ui::OSExchangeDataProviderAuraX11::Clone() const': ../../ui/base/dragdrop/os_exchange_data_provider_aurax11.cc:115:10: error: invalid conversion from 'std::unique_ptr<ui::OSExchangeDataProviderAuraX11>' to 'std::unique_ptr<ui::OSExchangeDataProviderAuraX11>&&' [-fpermissive] In file included from /usr/include/c++/4.8/memory:81:0, from ../../base/threading/thread_collision_warner.h:8, from ../../base/memory/ref_counted.h:21, from ../../base/pickle.h:17, from ../../ui/base/dragdrop/os_exchange_data_provider_aurax11.h:18, from ../../ui/base/dragdrop/os_exchange_data_provider_aurax11.cc:5: /usr/include/c++/4.8/bits/unique_ptr.h:169:2: error: initializing argument 1 of 'std::unique_ptr<_Tp, _Dp>::unique_ptr(std::unique_ptr<_Up, _Ep>&&) [with _Up = ui::OSExchangeDataProviderAuraX11; _Ep = std::default_delete<ui::OSExchangeDataProviderAuraX11>; <template-parameter-2-3> = void; _Tp = ui::OSExchangeData::Provider; _Dp = std::default_delete<ui::OSExchangeData::Provider>]' [-fpermissive] ../../ui/base/dragdrop/os_exchange_data_provider_aurax11.cc:115:10: error: cannot convert 'ret' from type 'std::unique_ptr<ui::OSExchangeDataProviderAuraX11>' to type 'std::unique_ptr<ui::OSExchangeDataProviderAuraX11>&&' ../../ui/base/dragdrop/os_exchange_data_provider_aurax11.cc:116:1: error: control reaches end of non-void function [-Werror=return-type] cc1plus: all warnings being treated as errors
lgtm
dcheng@chromium.org changed reviewers: + dcheng@chromium.org
https://codereview.chromium.org/2192533002/diff/1/ui/base/dragdrop/os_exchang... File ui/base/dragdrop/os_exchange_data_provider_aurax11.cc (left): https://codereview.chromium.org/2192533002/diff/1/ui/base/dragdrop/os_exchang... ui/base/dragdrop/os_exchange_data_provider_aurax11.cc:115: return ret; Please keep the original code and just use std::move() to convert.
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
https://codereview.chromium.org/2192533002/diff/1/ui/base/dragdrop/os_exchang... File ui/base/dragdrop/os_exchange_data_provider_aurax11.cc (left): https://codereview.chromium.org/2192533002/diff/1/ui/base/dragdrop/os_exchang... ui/base/dragdrop/os_exchange_data_provider_aurax11.cc:115: return ret; On 2016/07/27 17:05:44, dcheng wrote: > Please keep the original code and just use std::move() to convert. Done.
The CQ bit was checked by mostynb@opera.com
The patchset sent to the CQ was uploaded after l-g-t-m from erg@chromium.org Link to the patchset: https://codereview.chromium.org/2192533002/#ps20001 (title: "use std::move")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)
The CQ bit was checked by mostynb@opera.com to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
LGTM
The CQ bit was checked by mostynb@opera.com
The patchset sent to the CQ was uploaded after l-g-t-m from erg@chromium.org Link to the patchset: https://codereview.chromium.org/2192533002/#ps40001 (title: "IWYU: <utility>")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
Message was sent while issue was closed.
Committed patchset #3 (id:40001)
Message was sent while issue was closed.
Description was changed from ========== (gcc) fix compilation of os_exchange_data_provider_aurax11.cc This fixes a gcc compilation error in os_exchange_data_provider_aurax11.cc: error: cannot convert 'ret' from type 'std::unique_ptr<ui::OSExchangeDataProviderAuraX11>' to type 'std::unique_ptr<ui::OSExchangeDataProviderAuraX11>&&' Tested with gcc 4.8.4. Followup to https://codereview.chromium.org/2179813003 BUG=614037 ========== to ========== (gcc) fix compilation of os_exchange_data_provider_aurax11.cc This fixes a gcc compilation error in os_exchange_data_provider_aurax11.cc: error: cannot convert 'ret' from type 'std::unique_ptr<ui::OSExchangeDataProviderAuraX11>' to type 'std::unique_ptr<ui::OSExchangeDataProviderAuraX11>&&' Tested with gcc 4.8.4. Followup to https://codereview.chromium.org/2179813003 BUG=614037 Committed: https://crrev.com/3624c6c095108839db78c01dce92c731cf10b954 Cr-Commit-Position: refs/heads/master@{#408233} ==========
Message was sent while issue was closed.
Patchset 3 (id:??) landed as https://crrev.com/3624c6c095108839db78c01dce92c731cf10b954 Cr-Commit-Position: refs/heads/master@{#408233} |