| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 1 | let compiler decide on copy elision |
| 2 | Fixes compiler errors with clang |
| 3 | | ../../frame-2.5.0/src/x11/device_x11.cpp:126:13: error: moving a temporary object prevents copy elision [-Werror,-Wpessimizing-move] |
| 4 | | std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis))); |
| 5 | | ^ |
| 6 | | ../../frame-2.5.0/src/x11/device_x11.cpp:126:13: note: remove std::move call here |
| 7 | | std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis))); |
| 8 | | ^~~~~~~~~~ ~ |
| 9 | | 1 error generated. |
| 10 | |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | Upstream-Status: Pending |
| 13 | |
| 14 | Index: frame-2.5.0/src/x11/device_x11.cpp |
| 15 | =================================================================== |
| 16 | --- frame-2.5.0.orig/src/x11/device_x11.cpp |
| 17 | +++ frame-2.5.0/src/x11/device_x11.cpp |
| 18 | @@ -122,8 +122,7 @@ UFDeviceX11::UFDeviceX11(Display* displa |
| 19 | UFAxis_* axis = new UFAxis(type, valuator_info->min, valuator_info->max, |
| 20 | valuator_info->resolution); |
| 21 | |
| 22 | - axes_[type] = |
| 23 | - std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis))); |
| 24 | + axes_[type] = UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis)); |
| 25 | |
| 26 | axis_map_[valuator_info->number] = type; |
| 27 | |