Merge lp://qastaging/~alan-griffiths/mir/fix-1475994-g++-5-backport-to-0.13 into lp://qastaging/mir/0.13
Proposed by
Alan Griffiths
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~alan-griffiths/mir/fix-1475994-g++-5-backport-to-0.13 |
| Merge into: | lp://qastaging/mir/0.13 |
| Diff against target: |
205 lines (+25/-71) 8 files modified
debian/changelog (+9/-0) examples/basic.c (+2/-2) examples/flicker.c (+2/-2) src/client/rpc/mir_protobuf_rpc_channel.cpp (+0/-1) src/include/common/mir/protobuf/google_protobuf_guard.h (+0/-40) src/protobuf/google_protobuf_guard.cpp (+10/-23) src/server/frontend/protobuf_connection_creator.cpp (+0/-1) tests/unit-tests/android_input/property_map.cpp (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~alan-griffiths/mir/fix-1475994-g++-5-backport-to-0.13 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
Commit message
Fix compiler errors from g++-5
Description of the change
Fix compiler errors from g++-5
To post a comment you must log in.
Unmerged revisions
- 2558. By Alan Griffiths
-
Update changelog
- 2557. By Alan Griffiths
-
Fix compiler errors from g++-5
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
