blob: aa5a56ab8791171072cef990015baf4b5785d70f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
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;
|
