mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

frame: Fix build with clang

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2016-10-18 22:38:23 -07:00
committed by Martin Jansa
parent 2280f696f8
commit 73c6871273
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/canonical-multitouch/frame/pessimizing-move.patch
+27
View File
@@ -0,0 +1,27 @@
let compiler decide on copy elision
Fixes compiler errors with clang
| ../../frame-2.5.0/src/x11/device_x11.cpp:126:13: error: moving a temporary object prevents copy elision [-Werror,-Wpessimizing-move]
| std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis)));
| ^
| ../../frame-2.5.0/src/x11/device_x11.cpp:126:13: note: remove std::move call here
| std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis)));
| ^~~~~~~~~~ ~
| 1 error generated.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: frame-2.5.0/src/x11/device_x11.cpp
===================================================================
--- frame-2.5.0.orig/src/x11/device_x11.cpp
+++ frame-2.5.0/src/x11/device_x11.cpp
@@ -122,8 +122,7 @@ UFDeviceX11::UFDeviceX11(Display* displa
UFAxis_* axis = new UFAxis(type, valuator_info->min, valuator_info->max,
valuator_info->resolution);
- axes_[type] =
- std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis)));
+ axes_[type] = UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis));
axis_map_[valuator_info->number] = type;
meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb
+2 -1
View File
@@ -10,7 +10,8 @@ LIC_FILES_CHKSUM = " \
inherit autotools pkgconfig
SRC_URI = "https://launchpad.net/${BPN}/trunk/v${PV}/+download/${BPN}-${PV}.tar.gz"
SRC_URI = "https://launchpad.net/${BPN}/trunk/v${PV}/+download/${BPN}-${PV}.tar.gz \
file://pessimizing-move.patch"
SRC_URI[md5sum] = "02baa941091c5d198cd1623b3ad36e68"
SRC_URI[sha256sum] = "cfb9ab52cdccd926f1822a457264d0014c7eb9f4600a72626063dd073b26256f"