From 888874f761fdd69bb9448b3905627289b5fd66dd Mon Sep 17 00:00:00 2001 From: floppymaster Date: Thu, 19 Jan 2017 20:20:45 -0800 Subject: [PATCH] Allow GCC 4.9 to compile Chromium In order to implicit cast an lvalue to an rvalue when returning from a function, the return type and type of variable in the return statement previously had to be exactly the same. When this was not the case, std::move was required. For instance, when returning a std::unique_ptr variable in a function with a std::unique_ptr return type, std::move is required. DR 1579 changed this, and allows for implicitly converting to the return type, if the return type has a constructor(T&&), where T is the type of the local variable being returned. DR 1579 was implemented in GCC 5, but not in GCC 4.9 and below. By explicitly qualifying the local variable with std::move, we allow for compiling with GCC 4.9 and incur no performance penalty. The code is still absolutely correct to the word of C++11. BUG=chromium:682965 See also: * https://bugs.gentoo.org/show_bug.cgi?id=600288 * https://stackoverflow.com/questions/22018115/converting-stdunique-ptrderived-to-stdunique-ptrbase#comment33375875_22018521 * http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n3833.html#1579 Review-Url: https://codereview.webrtc.org/2642053003 Cr-Commit-Position: refs/heads/master@{#16175} --- AUTHORS | 1 + webrtc/modules/desktop_capture/screen_capturer_x11.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) --- a/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc +++ b/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc @@ -412,7 +412,7 @@ std::unique_ptr DesktopCapturer::CreateRawScreenCapturer( return nullptr; } - return capturer; + return std::move(capturer); } } // namespace webrtc -- 2.11.0