Mir

Merge lp:~albaguirre/mir/cleanup-unused-lambda-captures into lp:mir

  1. cleanup-unused-lambda-captures
  2. Merge into development-branch
Proposed by Alberto Aguirre
Status: Merged
Approved by: Alberto Aguirre
Approved revision: no longer in the source branch.
Merged at revision: 3997
Proposed branch: lp:~albaguirre/mir/cleanup-unused-lambda-captures
Merge into: lp:mir
Diff against target: 496 lines (+45/-45)
26 files modified
src/client/default_connection_configuration.cpp (+1/-1)
src/common/dispatch/threaded_dispatcher.cpp (+1/-1)
src/platforms/android/utils/test_android_hardware_sanity.cpp (+1/-1)
src/platforms/eglstream-kms/server/display.cpp (+1/-1)
src/server/compositor/default_configuration.cpp (+1/-1)
src/server/default_server_configuration.cpp (+3/-3)
src/server/graphics/default_configuration.cpp (+1/-1)
src/server/graphics/nested/display.cpp (+1/-1)
src/server/input/default_configuration.cpp (+4/-4)
src/server/scene/mediating_display_changer.cpp (+1/-1)
src/server/shell/abstract_shell.cpp (+1/-1)
tests/acceptance-tests/test_nested_mir.cpp (+1/-1)
tests/acceptance-tests/test_new_display_configuration.cpp (+3/-3)
tests/acceptance-tests/test_prompt_session_client_api.cpp (+1/-1)
tests/integration-tests/test_buffer_scheduling.cpp (+1/-1)
tests/integration-tests/test_server_shutdown.cpp (+1/-1)
tests/integration-tests/test_surface_first_frame_sync.cpp (+1/-1)
tests/mir_test_framework/headless_test.cpp (+1/-1)
tests/unit-tests/client/test_mir_prompt_session.cpp (+2/-2)
tests/unit-tests/client/test_mir_screencast.cpp (+2/-2)
tests/unit-tests/client/test_stream_transport.cpp (+4/-4)
tests/unit-tests/graphics/test_default_display_configuration_policy.cpp (+5/-5)
tests/unit-tests/platforms/android/server/test_display.cpp (+3/-3)
tests/unit-tests/platforms/mesa/kms/test_display.cpp (+1/-1)
tests/unit-tests/test_glib_main_loop.cpp (+2/-2)
tests/unit-tests/test_raii.cpp (+1/-1)
To merge this branch: bzr merge lp:~albaguirre/mir/cleanup-unused-lambda-captures
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Kevin DuBois (community) Approve
Alan Griffiths Approve
Review via email: mp+315803@code.launchpad.net

Commit message

Cleanup unused lambda captures.

Unused lambda captures produce warnings on clang 5.0

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3995
https://mir-jenkins.ubuntu.com/job/mir-ci/2886/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3806
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3885
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3876
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3876
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3876
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3833
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3833/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3833
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3833/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3833
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3833/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3833
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3833/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3833
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3833/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3833
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3833/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2886/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

- config->for_each_output([orientation](mg::UserDisplayConfigurationOutput& output) {
+ config->for_each_output([&](mg::UserDisplayConfigurationOutput& output) {

How's that an "unused lambda capture"?

review: Approve
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

It's not, but it's raising a warning:

mir/devel/tests/unit-tests/platforms/android/server/test_display.cpp:981:30: error: lambda capture 'orientation' is not required to
      be captured for this use [-Werror,-Wunused-lambda-capture]

ahhh.. I think it's because "orientation" is const:

MirOrientation const orientation = mir_orientation_left;

and the lambda is:

[orientation](mg::UserDisplayConfigurationOutput& output) { output.orientation = orientation; }

so this is fine:

[](mg::UserDisplayConfigurationOutput& output) { output.orientation = orientation; }

Yep that works on GCC 6 as well.

I'll go over those again.

Revision history for this message
Kevin DuBois (kdub) wrote :

lgt m

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3996
https://mir-jenkins.ubuntu.com/job/mir-ci/2889/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3809
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3888
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3878
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3878
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3878
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3836
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3836/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3836
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3836/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3836
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3836/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3836
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3836/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3836
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3836/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3836
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3836/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2889/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/client/default_connection_configuration.cpp'
2--- src/client/default_connection_configuration.cpp 2017-01-18 02:29:37 +0000
3+++ src/client/default_connection_configuration.cpp 2017-01-27 19:23:32 +0000
4@@ -241,7 +241,7 @@
5 std::shared_ptr<mir::client::AsyncBufferFactory> mir::client::DefaultConnectionConfiguration::the_buffer_factory()
6 {
7 return async_buffer_factory(
8- [this] () -> std::shared_ptr<mir::client::AsyncBufferFactory>
9+ [] () -> std::shared_ptr<mir::client::AsyncBufferFactory>
10 {
11 return std::make_shared<mir::client::BufferFactory>();
12 });
13
14=== modified file 'src/common/dispatch/threaded_dispatcher.cpp'
15--- src/common/dispatch/threaded_dispatcher.cpp 2016-01-29 08:18:22 +0000
16+++ src/common/dispatch/threaded_dispatcher.cpp 2017-01-27 19:23:32 +0000
17@@ -285,7 +285,7 @@
18
19 auto dying_thread = std::find_if(threadpool.begin(),
20 threadpool.end(),
21- [this, &terminated_thread_id](std::thread const& candidate)
22+ [&terminated_thread_id](std::thread const& candidate)
23 {
24 return candidate.get_id() == terminated_thread_id;
25 });
26
27=== modified file 'src/platforms/android/utils/test_android_hardware_sanity.cpp'
28--- src/platforms/android/utils/test_android_hardware_sanity.cpp 2017-01-18 02:29:37 +0000
29+++ src/platforms/android/utils/test_android_hardware_sanity.cpp 2017-01-27 19:23:32 +0000
30@@ -74,7 +74,7 @@
31 void start() override {};
32 void stop() override {};
33 };
34- return compositor( [this]() { return std::make_shared<NullCompositor>(); });
35+ return compositor( []() { return std::make_shared<NullCompositor>(); });
36 }
37 };
38
39
40=== modified file 'src/platforms/eglstream-kms/server/display.cpp'
41--- src/platforms/eglstream-kms/server/display.cpp 2017-01-18 02:29:37 +0000
42+++ src/platforms/eglstream-kms/server/display.cpp 2017-01-27 19:23:32 +0000
43@@ -289,7 +289,7 @@
44 {
45 auto kms_conf = dynamic_cast<KMSDisplayConfiguration const&>(conf);
46 active_sync_groups.clear();
47- kms_conf.for_each_output([this, &conf](kms::EGLOutput const& output)
48+ kms_conf.for_each_output([this](kms::EGLOutput const& output)
49 {
50 if (output.used)
51 {
52
53=== modified file 'src/server/compositor/default_configuration.cpp'
54--- src/server/compositor/default_configuration.cpp 2017-01-18 02:29:37 +0000
55+++ src/server/compositor/default_configuration.cpp 2017-01-27 19:23:32 +0000
56@@ -99,7 +99,7 @@
57 std::shared_ptr<mir::renderer::RendererFactory> mir::DefaultServerConfiguration::the_renderer_factory()
58 {
59 return renderer_factory(
60- [this]()
61+ []()
62 {
63 return std::make_shared<mir::renderer::gl::RendererFactory>();
64 });
65
66=== modified file 'src/server/default_server_configuration.cpp'
67--- src/server/default_server_configuration.cpp 2017-01-18 02:29:37 +0000
68+++ src/server/default_server_configuration.cpp 2017-01-27 19:23:32 +0000
69@@ -88,7 +88,7 @@
70 mir::DefaultServerConfiguration::the_session_listener()
71 {
72 return session_listener(
73- [this]
74+ []
75 {
76 return std::make_shared<ms::NullSessionListener>();
77 });
78@@ -98,7 +98,7 @@
79 mir::DefaultServerConfiguration::the_prompt_session_listener()
80 {
81 return prompt_session_listener(
82- [this]
83+ []
84 {
85 return std::make_shared<ms::NullPromptSessionListener>();
86 });
87@@ -212,7 +212,7 @@
88 -> std::shared_ptr<ml::Logger>
89 {
90 return logger(
91- [this]() -> std::shared_ptr<ml::Logger>
92+ []() -> std::shared_ptr<ml::Logger>
93 {
94 return std::make_shared<ml::DumbConsoleLogger>();
95 });
96
97=== modified file 'src/server/graphics/default_configuration.cpp'
98--- src/server/graphics/default_configuration.cpp 2017-01-18 02:29:37 +0000
99+++ src/server/graphics/default_configuration.cpp 2017-01-27 19:23:32 +0000
100@@ -243,7 +243,7 @@
101 mir::DefaultServerConfiguration::the_gl_config()
102 {
103 return gl_config(
104- [this]
105+ []
106 {
107 struct NoGLConfig : public mg::GLConfig
108 {
109
110=== modified file 'src/server/graphics/nested/display.cpp'
111--- src/server/graphics/nested/display.cpp 2017-01-18 02:29:37 +0000
112+++ src/server/graphics/nested/display.cpp 2017-01-27 19:23:32 +0000
113@@ -399,7 +399,7 @@
114 if (!std::any_of(
115 new_outputs.begin(),
116 new_outputs.end(),
117- [id = existing_output.first](auto const&output) { return output.id == id; }))
118+ [&existing_output](auto const& output) { return output.id == existing_output.first; }))
119 {
120 // At least one of the existing outputs isn't used in the ne
121 return false;
122
123=== modified file 'src/server/input/default_configuration.cpp'
124--- src/server/input/default_configuration.cpp 2017-01-18 02:29:37 +0000
125+++ src/server/input/default_configuration.cpp 2017-01-27 19:23:32 +0000
126@@ -102,7 +102,7 @@
127 std::shared_ptr<mi::InputRegion> mir::DefaultServerConfiguration::the_input_region()
128 {
129 return input_region(
130- [this]()
131+ []()
132 {
133 return std::make_shared<mi::DisplayInputRegion>();
134 });
135@@ -259,7 +259,7 @@
136 mir::DefaultServerConfiguration::the_cursor_images()
137 {
138 return cursor_images(
139- [this]() -> std::shared_ptr<mi::CursorImages>
140+ []() -> std::shared_ptr<mi::CursorImages>
141 {
142 return std::make_shared<mi::BuiltinCursorImages>();
143 });
144@@ -316,7 +316,7 @@
145 mir::DefaultServerConfiguration::the_input_reading_multiplexer()
146 {
147 return input_reading_multiplexer(
148- [this]() -> std::shared_ptr<mir::dispatch::MultiplexingDispatchable>
149+ []() -> std::shared_ptr<mir::dispatch::MultiplexingDispatchable>
150 {
151 return std::make_shared<mir::dispatch::MultiplexingDispatchable>();
152 }
153@@ -374,7 +374,7 @@
154 std::shared_ptr<mi::KeyMapper> mir::DefaultServerConfiguration::the_key_mapper()
155 {
156 return key_mapper(
157- [this]()
158+ []()
159 {
160 return std::make_shared<mi::receiver::XKBMapper>();
161 });
162
163=== modified file 'src/server/scene/mediating_display_changer.cpp'
164--- src/server/scene/mediating_display_changer.cpp 2017-01-19 09:38:52 +0000
165+++ src/server/scene/mediating_display_changer.cpp 2017-01-27 19:23:32 +0000
166@@ -290,7 +290,7 @@
167
168 server_action_queue->enqueue(
169 this,
170- [this, conf, session, timeout]()
171+ [this, conf, session]()
172 {
173 if (auto live_session = session.lock())
174 {
175
176=== modified file 'src/server/shell/abstract_shell.cpp'
177--- src/server/shell/abstract_shell.cpp 2017-01-18 02:29:37 +0000
178+++ src/server/shell/abstract_shell.cpp 2017-01-27 19:23:32 +0000
179@@ -137,7 +137,7 @@
180 ms::SurfaceCreationParameters const& params,
181 std::shared_ptr<mf::EventSink> const& sink)
182 {
183- auto const build = [this, sink](std::shared_ptr<ms::Session> const& session, ms::SurfaceCreationParameters const& placed_params)
184+ auto const build = [sink](std::shared_ptr<ms::Session> const& session, ms::SurfaceCreationParameters const& placed_params)
185 {
186 return session->create_surface(placed_params, sink);
187 };
188
189=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
190--- tests/acceptance-tests/test_nested_mir.cpp 2017-01-24 14:38:06 +0000
191+++ tests/acceptance-tests/test_nested_mir.cpp 2017-01-27 19:23:32 +0000
192@@ -277,7 +277,7 @@
193
194 virtual std::shared_ptr<MockDisplayConfigurationPolicy> mock_display_configuration_policy()
195 {
196- return mock_display_configuration_policy_([this]
197+ return mock_display_configuration_policy_([]
198 { return std::make_shared<NiceMock<MockDisplayConfigurationPolicy>>(); });
199 }
200
201
202=== modified file 'tests/acceptance-tests/test_new_display_configuration.cpp'
203--- tests/acceptance-tests/test_new_display_configuration.cpp 2017-01-26 19:58:38 +0000
204+++ tests/acceptance-tests/test_new_display_configuration.cpp 2017-01-27 19:23:32 +0000
205@@ -1499,7 +1499,7 @@
206 auto config = client.get_base_config();
207
208 ErrorValidator validator;
209- validator.validate = [&config](MirError const* error)
210+ validator.validate = [](MirError const* error)
211 {
212 EXPECT_THAT(mir_error_get_domain(error), Eq(mir_error_domain_display_configuration));
213 EXPECT_THAT(mir_error_get_code(error), Eq(mir_display_configuration_error_unauthorized));
214@@ -1564,7 +1564,7 @@
215 auto config = client.get_base_config();
216
217 ErrorValidator validator;
218- validator.validate = [&config](MirError const* error)
219+ validator.validate = [](MirError const* error)
220 {
221 EXPECT_THAT(mir_error_get_domain(error), Eq(mir_error_domain_display_configuration));
222 EXPECT_THAT(mir_error_get_code(error), Eq(mir_display_configuration_error_in_progress));
223@@ -1636,7 +1636,7 @@
224 auto config = client.get_base_config();
225
226 ErrorValidator validator;
227- validator.validate = [&config](MirError const* error)
228+ validator.validate = [](MirError const* error)
229 {
230 EXPECT_THAT(mir_error_get_domain(error), Eq(mir_error_domain_display_configuration));
231 EXPECT_THAT(mir_error_get_code(error), Eq(mir_display_configuration_error_no_preview_in_progress));
232
233=== modified file 'tests/acceptance-tests/test_prompt_session_client_api.cpp'
234--- tests/acceptance-tests/test_prompt_session_client_api.cpp 2017-01-24 14:38:06 +0000
235+++ tests/acceptance-tests/test_prompt_session_client_api.cpp 2017-01-27 19:23:32 +0000
236@@ -114,7 +114,7 @@
237
238 std::shared_ptr<MockSessionAuthorizer> the_mock_session_authorizer()
239 {
240- return mock_prompt_session_authorizer([this]
241+ return mock_prompt_session_authorizer([]
242 {
243 return std::make_shared<NiceMock<MockSessionAuthorizer>>();
244 });
245
246=== modified file 'tests/integration-tests/test_buffer_scheduling.cpp'
247--- tests/integration-tests/test_buffer_scheduling.cpp 2017-01-19 09:38:52 +0000
248+++ tests/integration-tests/test_buffer_scheduling.cpp 2017-01-27 19:23:32 +0000
249@@ -336,7 +336,7 @@
250 }
251 ~ScheduledProducer()
252 {
253- ipc->on_client_bound_transfer([this](mp::BufferRequest&){});
254+ ipc->on_client_bound_transfer([](mp::BufferRequest&){});
255 }
256
257 bool can_produce()
258
259=== modified file 'tests/integration-tests/test_server_shutdown.cpp'
260--- tests/integration-tests/test_server_shutdown.cpp 2017-01-18 02:29:37 +0000
261+++ tests/integration-tests/test_server_shutdown.cpp 2017-01-27 19:23:32 +0000
262@@ -209,7 +209,7 @@
263 the_display_buffer_compositor_factory() override
264 {
265 return display_buffer_compositor_factory(
266- [this]()
267+ []()
268 {
269 return std::make_shared<ExceptionThrowingDisplayBufferCompositorFactory>();
270 });
271
272=== modified file 'tests/integration-tests/test_surface_first_frame_sync.cpp'
273--- tests/integration-tests/test_surface_first_frame_sync.cpp 2017-01-18 02:29:37 +0000
274+++ tests/integration-tests/test_surface_first_frame_sync.cpp 2017-01-27 19:23:32 +0000
275@@ -86,7 +86,7 @@
276 group.post();
277 });
278 };
279- auto notify2 = [this, notify](int) { notify(); };
280+ auto notify2 = [notify](int) { notify(); };
281
282 observer = std::make_shared<ms::LegacySceneChangeNotification>(notify, notify2);
283 }
284
285=== modified file 'tests/mir_test_framework/headless_test.cpp'
286--- tests/mir_test_framework/headless_test.cpp 2017-01-18 02:29:37 +0000
287+++ tests/mir_test_framework/headless_test.cpp 2017-01-27 19:23:32 +0000
288@@ -34,7 +34,7 @@
289 add_to_environment("MIR_SERVER_PLATFORM_GRAPHICS_LIB", mtf::server_platform("graphics-dummy.so").c_str());
290 add_to_environment("MIR_SERVER_PLATFORM_INPUT_LIB", mtf::server_platform("input-stub.so").c_str());
291 add_to_environment("MIR_SERVER_ENABLE_KEY_REPEAT", "false");
292- server.override_the_display_buffer_compositor_factory([this]
293+ server.override_the_display_buffer_compositor_factory([]
294 {
295 return std::make_shared<mtf::HeadlessDisplayBufferCompositorFactory>();
296 });
297
298=== modified file 'tests/unit-tests/client/test_mir_prompt_session.cpp'
299--- tests/unit-tests/client/test_mir_prompt_session.cpp 2017-01-18 02:29:37 +0000
300+++ tests/unit-tests/client/test_mir_prompt_session.cpp 2017-01-27 19:23:32 +0000
301@@ -73,7 +73,7 @@
302 if (server_thread.joinable())
303 server_thread.join();
304 server_thread = std::thread{
305- [response, done, this]
306+ [response, done]
307 {
308 response->clear_error();
309 done->Run();
310@@ -87,7 +87,7 @@
311 {
312 if (server_thread.joinable())
313 server_thread.join();
314- server_thread = std::thread{[done, this] { done->Run(); }};
315+ server_thread = std::thread{[done] { done->Run(); }};
316 }
317
318 ~StubProtobufServer()
319
320=== modified file 'tests/unit-tests/client/test_mir_screencast.cpp'
321--- tests/unit-tests/client/test_mir_screencast.cpp 2017-01-18 02:29:37 +0000
322+++ tests/unit-tests/client/test_mir_screencast.cpp 2017-01-27 19:23:32 +0000
323@@ -71,7 +71,7 @@
324 if (server_thread.joinable())
325 server_thread.join();
326 server_thread = std::thread{
327- [response, done, this]
328+ [response, done]
329 {
330 response->clear_error();
331 done->Run();
332@@ -85,7 +85,7 @@
333 {
334 if (server_thread.joinable())
335 server_thread.join();
336- server_thread = std::thread{[done, this] { done->Run(); }};
337+ server_thread = std::thread{[done] { done->Run(); }};
338 }
339
340 ~StubProtobufServer()
341
342=== modified file 'tests/unit-tests/client/test_stream_transport.cpp'
343--- tests/unit-tests/client/test_stream_transport.cpp 2017-01-18 02:29:37 +0000
344+++ tests/unit-tests/client/test_stream_transport.cpp 2017-01-27 19:23:32 +0000
345@@ -129,7 +129,7 @@
346 auto observer = std::make_shared<NiceMock<MockObserver>>();
347
348 ON_CALL(*observer, on_data_available())
349- .WillByDefault(Invoke([dummy, this]()
350+ .WillByDefault(Invoke([this]()
351 {
352 decltype(dummy) buffer;
353 this->transport->receive_data(&buffer, sizeof(dummy));
354@@ -158,7 +158,7 @@
355 EXPECT_EQ(ssizeof(dummy), write(this->test_fd, &dummy, sizeof(dummy)));
356 ::close(this->test_fd);
357
358- ON_CALL(*observer, on_data_available()).WillByDefault(Invoke([this, dummy, &data_available]()
359+ ON_CALL(*observer, on_data_available()).WillByDefault(Invoke([this, &data_available]()
360 {
361 decltype(dummy) buffer;
362 this->transport->receive_data(&buffer, sizeof(buffer));
363@@ -194,7 +194,7 @@
364 EXPECT_EQ(ssizeof(dummy), write(this->test_fd, &dummy, sizeof(dummy)));
365 ::close(this->test_fd);
366
367- ON_CALL(*observer, on_data_available()).WillByDefault(Invoke([this, dummy, &data_available]()
368+ ON_CALL(*observer, on_data_available()).WillByDefault(Invoke([this, &data_available]()
369 {
370 decltype(dummy) buffer;
371 this->transport->receive_data(&buffer, sizeof(buffer));
372@@ -378,7 +378,7 @@
373 ON_CALL(*observer, on_disconnected()).WillByDefault(Invoke([&disconnected]()
374 { disconnected = true; }));
375 ON_CALL(*observer, on_data_available())
376- .WillByDefault(Invoke([dummy, &notify_count, this]()
377+ .WillByDefault(Invoke([this, &notify_count]()
378 {
379 notify_count++;
380
381
382=== modified file 'tests/unit-tests/graphics/test_default_display_configuration_policy.cpp'
383--- tests/unit-tests/graphics/test_default_display_configuration_policy.cpp 2017-01-18 02:29:37 +0000
384+++ tests/unit-tests/graphics/test_default_display_configuration_policy.cpp 2017-01-27 19:23:32 +0000
385@@ -142,7 +142,7 @@
386
387 policy.apply_to(conf);
388
389- conf.for_each_output([&conf](DisplayConfigurationOutput const& output)
390+ conf.for_each_output([](DisplayConfigurationOutput const& output)
391 {
392 if (output.connected && output.modes.size() > 0)
393 {
394@@ -179,7 +179,7 @@
395 CloneDisplayConfigurationPolicy policy;
396 StubDisplayConfiguration conf{create_default_configuration()};
397
398- conf.for_each_output([&conf](DisplayConfigurationOutput const& output)
399+ conf.for_each_output([](DisplayConfigurationOutput const& output)
400 {
401 EXPECT_EQ(mir_orientation_normal, output.orientation);
402 });
403@@ -241,7 +241,7 @@
404
405 bool is_first{true};
406
407- conf.for_each_output([&conf, &is_first](DisplayConfigurationOutput const& output)
408+ conf.for_each_output([&is_first](DisplayConfigurationOutput const& output)
409 {
410 if (output.connected && output.modes.size() > 0 && is_first)
411 {
412@@ -286,7 +286,7 @@
413 auto conf = create_default_configuration();
414 //StubDisplayConfiguration conf{create_default_configuration()};
415
416- conf.for_each_output([&conf](DisplayConfigurationOutput const& output)
417+ conf.for_each_output([](DisplayConfigurationOutput const& output)
418 {
419 EXPECT_EQ(mir_orientation_normal, output.orientation);
420 });
421@@ -345,7 +345,7 @@
422 SideBySideDisplayConfigurationPolicy policy;
423 StubDisplayConfiguration conf{create_default_configuration()};
424
425- conf.for_each_output([&conf](DisplayConfigurationOutput const& output)
426+ conf.for_each_output([](DisplayConfigurationOutput const& output)
427 {
428 EXPECT_EQ(mir_orientation_normal, output.orientation);
429 });
430
431=== modified file 'tests/unit-tests/platforms/android/server/test_display.cpp'
432--- tests/unit-tests/platforms/android/server/test_display.cpp 2017-01-18 02:29:37 +0000
433+++ tests/unit-tests/platforms/android/server/test_display.cpp 2017-01-27 19:23:32 +0000
434@@ -978,12 +978,12 @@
435 hotplug_fn();
436
437 auto config = display.configuration();
438- config->for_each_output([orientation](mg::UserDisplayConfigurationOutput& output) {
439+ config->for_each_output([](mg::UserDisplayConfigurationOutput& output) {
440 output.orientation = orientation;
441 });
442 display.configure(*config);
443- display.for_each_display_sync_group([orientation](mg::DisplaySyncGroup& group) {
444- group.for_each_display_buffer([orientation](mg::DisplayBuffer& db) {
445+ display.for_each_display_sync_group([&](mg::DisplaySyncGroup& group) {
446+ group.for_each_display_buffer([&](mg::DisplayBuffer& db) {
447 EXPECT_THAT(db.orientation(), Eq(orientation));
448 });
449 });
450
451=== modified file 'tests/unit-tests/platforms/mesa/kms/test_display.cpp'
452--- tests/unit-tests/platforms/mesa/kms/test_display.cpp 2017-01-18 02:29:37 +0000
453+++ tests/unit-tests/platforms/mesa/kms/test_display.cpp 2017-01-27 19:23:32 +0000
454@@ -756,7 +756,7 @@
455
456 display->register_configuration_change_handler(
457 ml,
458- [&call_count, &ml, &done]()
459+ [&call_count, &done]()
460 {
461 if (++call_count == expected_call_count)
462 {
463
464=== modified file 'tests/unit-tests/test_glib_main_loop.cpp'
465--- tests/unit-tests/test_glib_main_loop.cpp 2017-01-18 02:29:37 +0000
466+++ tests/unit-tests/test_glib_main_loop.cpp 2017-01-27 19:23:32 +0000
467@@ -185,7 +185,7 @@
468
469
470 std::thread signal_sending_thread(
471- [this, num_signals_to_send, &signals, &num_handled_signals]
472+ [this, &signals, &num_handled_signals]
473 {
474 for (size_t i = 0; i < num_signals_to_send; i++)
475 {
476@@ -352,7 +352,7 @@
477 });
478
479 std::thread fd_writing_thread{
480- [this, num_elems_to_send, &pipes, &num_handled_fds]
481+ [this, &pipes, &num_handled_fds]
482 {
483 for (size_t i = 0; i < num_elems_to_send; i++)
484 {
485
486=== modified file 'tests/unit-tests/test_raii.cpp'
487--- tests/unit-tests/test_raii.cpp 2015-06-17 05:20:42 +0000
488+++ tests/unit-tests/test_raii.cpp 2017-01-27 19:23:32 +0000
489@@ -90,7 +90,7 @@
490
491 auto const raii = mir::raii::paired_calls(
492 ::create_ptr,
493- [this] (RaiiTest*p){ ::destroy_ptr(p); });
494+ [] (RaiiTest*p){ ::destroy_ptr(p); });
495
496 raii->test_call();
497

Subscribers

People subscribed via source and target branches