commit | f7c0f5fc1c619308139b2e4c099bc139ad45f7a2 | [log] [tgz] |
---|---|---|
author | Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | Mon May 07 18:44:22 2018 |
committer | Commit Bot <commit-bot@chromium.org> | Mon May 07 18:44:22 2018 |
tree | 4fba1674a13a737be2df373739f5038a241949cf | |
parent | 7bd37b662499dbe84ff0724b5002a7b656ef10ac [diff] |
media router: Fix GCC build after 72d48c21c Commit 72d48c21c ("Add MRUIBase and MRViewsUI") added code that follows the following pattern: base::Optional<T> Foo() { T t; return t; } clang seems to automatically convert |t| to an rvalue reference, but GCC fails with: ../../chrome/browser/ui/media_router/media_router_ui_base.cc: In member function ‘base::Optional<media_router::RouteParameters> media_router::MediaRouterUIBase::GetRouteParameters(const Id&, media_router::MediaCastMode)’: ../../chrome/browser/ui/media_router/media_router_ui_base.cc:325:10: error: could not convert ‘params’ from ‘media_router::RouteParameters’ to ‘base::Optional<media_router::RouteParameters>’ return params; ^~~~~~ ../../chrome/browser/ui/webui/media_router/media_router_ui.cc: In member function ‘base::Optional<media_router::RouteParameters> media_router::MediaRouterUI::GetLocalFileRouteParameters(const Id&, const GURL&, content::WebContents*)’: ../../chrome/browser/ui/webui/media_router/media_router_ui.cc:421:10: error: could not convert ‘params’ from ‘media_router::RouteParameters’ to ‘base::Optional<media_router::RouteParameters>’ return params; ^~~~~~ Make the code build everywhere by explicitly using std::move() on the return value. Bug: 819294 Change-Id: I3c9d76d1ac595be90417603dcde9ff43c147fadd Reviewed-on: https://chromium-review.googlesource.com/1043870 Reviewed-by: Derek Cheng <imcheng@chromium.org> Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> Cr-Commit-Position: refs/heads/master@{#556509}
Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.
The project's web site is https://www.chromium.org.
Documentation in the source is rooted in docs/README.md.
Learn how to Get Around the Chromium Source Code Directory Structure .