Mir

Merge lp:~vanvugt/mir/fix-1369389 into lp:mir

Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 1916
Proposed branch: lp:~vanvugt/mir/fix-1369389
Merge into: lp:mir
Diff against target: 20 lines (+2/-2)
1 file modified
tests/include/mir_test/auto_unblock_thread.h (+2/-2)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1369389
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Andreas Pokorny (community) Approve
Alexandros Frantzis (community) Approve
Review via email: mp+234613@code.launchpad.net

Commit message

Fix constructor syntax errors, which only just today g++ has decided
are fatal (LP: #1369389)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

OK.

review: Approve
Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

Tried with g++-4.9-13ubuntu1 and g++-4.9-10ubuntu2 this change does not cause a harm

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/include/mir_test/auto_unblock_thread.h'
2--- tests/include/mir_test/auto_unblock_thread.h 2014-09-10 12:50:53 +0000
3+++ tests/include/mir_test/auto_unblock_thread.h 2014-09-15 04:14:25 +0000
4@@ -41,7 +41,7 @@
5 explicit AutoUnblockThread(std::function<void(void)> const& unblock,
6 Callable&& f,
7 Args&&... args)
8- : unblock{unblock}, thread{f, args...}
9+ : unblock{unblock}, thread(f, args...)
10 {}
11
12 ~AutoUnblockThread()
13@@ -75,7 +75,7 @@
14 template<typename Callable, typename... Args>
15 explicit AutoJoinThread(Callable&& f,
16 Args&&... args)
17- : AutoUnblockThread{[]{}, f, args...}
18+ : AutoUnblockThread([]{}, f, args...)
19 {}
20 };
21

Subscribers

People subscribed via source and target branches